Update translations

* Corrected use of QCoreApplication::translate -> QObject::tr
* Corrected plural usage in EntryAttachmentsWidget.cpp

48 files changed, 121865 insertions, 36675 deletions

diff --git a/share/translations/keepassx_ar.ts b/share/translations/keepassx_ar.ts
index 30cc76903..37daf3d5f 100644
--- a/share/translations/keepassx_ar.ts
+++ b/share/translations/keepassx_ar.ts
@@ -38,12 +38,6 @@
         <translation>نسخ إلى الحافظة</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>الإصدار %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>مراجعة: %1</translation>
     </message>
@@ -76,35 +70,48 @@ Kernel: %3 %4</source>
         <translation>شكر خاص من فريق KeePassXC يذهب إلى debfx لإنشاء KeePassX الأصلي.</translation>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
-        <translation>نوع التكوين: %1
-</translation>
+        <source>Version %1</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>تأكيد وصول KeePassXC ل HTTP</translation>
+        <source>Build Type: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>تذكر هذا القرار</translation>
+        <source>Auto-Type</source>
+        <translation>الطباعة التلقائية</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>اسمح</translation>
+        <source>Browser Integration</source>
+        <translation>تكامل المتصفح</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>ارفض</translation>
+        <source>SSH Agent</source>
+        <translation>وكيل SSH</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>%1 طلب الدخول إلى كلمات المرور للعنصر التالي (العناصر) التالية.
-يرجى تحديد ما إذا كنت تريد السماح بالوصول أم لا.</translation>
+        <source>YubiKey</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -113,6 +120,277 @@ Please select whether you want to allow access.</source>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>تفعيل وكيل SSH (يتطلب إعادة التشغيل)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>إعدادات التطبيق</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>العام</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>الأمان</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>خطأ في الوصول لملف التكوين %1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>الإعدادات الأساسية</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>بدأ التشغيل</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>شغل تطبيق واحد فقط من KeePassXC</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>تذكر قواعد البيانات الأخيرة</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>تذكر الملفات الرئيسية الأخيرة و قواعد الأمن</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>إستعادة قواعد البيانات السابقة عند بدء التشغيل</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>تصغير النافذة عند بدء تشغيل التطبيق</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>إدارة الملفات</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation>حفظ ملفات قواعد البيانات بأمان (قد يكون غير متوافق مع Dropbox، إلخ)</translation>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation>إحتفظ بنسخة من ملف قاعدة البيانات قبل الحفظ</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>الحفظ تلقائيًا بعد كل تعديل</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>الحفظ تلقائيًا عند الإغلاق</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>عدم وضع علامة على قاعدة البيانات المعدلة للتغييرات غير المتعلقة بالبيانات (مثال، توسيع المجموعات)</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>إعادة تحميل قاعدة البيانات تلقائيا عند تعديلها خارجيًا</translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>إدارة الإدخالات</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>استخدم رمز المجموعة عند إنشاء الإدخال</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>تصغير عند النسخ إلى الحافظة</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>العام</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>اظهر أيقونة البرنامج في صينية النظام</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>رمز شريط المهام المظلم</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>إخفاء النافذة إلى شريط المهام عند تصغيرها</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>اللغة</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>الطباعة التلقائية</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>استخدم عنوان الإدخال لمطابقة النوافذ للطباعة التلقائية بشكل عام</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>استخدم رابط الإدخال لمطابقة النوافذ للطباعة التلقائية بشكل عام</translation>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>اسأل دائما قبل تنفيذ الطباعة التلقائية</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>المفتاح العام للطباعة التلقائية</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation>مل.ثانية</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>مهلة نفاد الوقت</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>امسح الذاكرة بعد</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> ثانية</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>أغلق قواعد البيانات بعد حالة عدم النشاط ل</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>السهولة</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>اقفل قواعد البيانات عندما تنقفل الجلسة أو يتم إغلاق اللابتوب</translation>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>قفل قواعد البيانات عند تصغير النافذة</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation>أعد قفل قاعدة البيانات التي تم تأمينها سابقًا بعد تنفيذ الطباعة التلقائية</translation>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>لا تطلب تكرار كلمة المرور عندما تكون مرئية</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>إخفاء مُدخل الملاحظات إفتراضيًا</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>الخصوصية</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -216,6 +494,26 @@ Please select whether you want to allow access.</source>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>ألغ</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -289,14 +587,6 @@ Please select whether you want to allow access.</source>
         <translation>فرز ومطابقة بيانات الإعتماد حسب إسم المستخدم</translation>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>&amp;فصل جميع المتصفحات</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>نسيان جميع &amp;التصريحات المحفوظة</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>متقدم</translation>
     </message>
@@ -362,14 +652,6 @@ Please select whether you want to allow access.</source>
         <translation>&lt;b&gt;تحذير:&lt;/b&gt; قد تكون الخيارات التالية خطيرة!</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>الملفات القابلة للتنفيذ (*.exe);;جميع الملفات (*.*)</translation>
-    </message>
-    <message>
-        <source>Executable Files (*)</source>
-        <translation>الملفات القابلة للتنفيذ (*)</translation>
-    </message>
-    <message>
         <source>Select custom proxy location</source>
         <translation>حدد موقع خادم الوكيل المخصص</translation>
     </message>
@@ -377,6 +659,31 @@ Please select whether you want to allow access.</source>
         <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
         <translation>نحن متأسفون, ولكن KeePassXC-Browser غير مدعوم لإصدارات Snap في الوقت الراهن.</translation>
     </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation type="unfinished"/>
+    </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: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not ask permission for HTTP &amp;Basic Auth</source>
+        <extracomment>An extra HTTP Basic Auth setting</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>BrowserService</name>
@@ -417,153 +724,43 @@ Do you want to overwrite it?</source>
         <translation>هل تريد تحديث المعلومات في %1 - %2؟</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: قاعدة البيانات أقفلت!</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>قاعدة البيانات هذه قد أقفلت!
-يرجى إلغاء قفل قاعدة البيانات المحددة أو اختيار واحدة أخرى تكون مفتوحة.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: الإعدادات غير متاحة!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation>لا تحتوي قاعدة البيانات النشطة على إدخال إعدادات.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: لم يُعثر على أية مفاتيح</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation>لم يُعثر على مفاتيح التشفير المشتركة في إعدادات KeePassXC.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: حُذِفت المفاتيح من قاعدة البيانات</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation><numerusform>حٌذفت %n مفتاح تشفير من إعدادات KeePassXC.</numerusform><numerusform>حٌذفت %n مفتاح تشفير من إعدادات KeePassXC.</numerusform><numerusform>حٌذفت %n مفتاح تشفير من إعدادات KeePassXC.</numerusform><numerusform>حُذفت %n مفاتيح تشفير من إعدادات KeePassXC.</numerusform><numerusform>حُذفت %n مفتاح تشفير من إعدادات KeePassXC.</numerusform><numerusform>حُذفت %n مفتاح تشفير من إعدادات KeePassXC.</numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>إزالة الصلاحيات المخزنة...</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>إجهاض </translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: حُذفت الصلاحيات</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation><numerusform>حُذفت الصلاحيات من %n مُدخل.</numerusform><numerusform>حُذفت الصلاحيات من %n مُدخل.</numerusform><numerusform>حُذفت الصلاحيات من %n مُدخل.</numerusform><numerusform>حُذفت الصلاحيات من %n مُدخل.</numerusform><numerusform>حُذفت الصلاحيات من %n مُدخل.</numerusform><numerusform>حُذفت الصلاحيات من %n مُدخل.</numerusform></translation>
+        <source>Converting attributes to custom data…</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: لا يوجد مُدخل مع الصلاحيات الموجودة!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>لا تحتوي قاعدة البيانات النشطة على إدخال مع صلاحيات.</translation>
-    </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>كلمه السر</translation>
-    </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>أدخل كلمة السر:</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>تكرار كلمة السر:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;ملف المفتاح</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>تصّفح</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>إنشاء</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>استجابة التحدي</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>تحديث</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>ملفات المفتاح</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>كل الملفات</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>إنشاء ملف مفتاح...</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>تعذر إنشاء ملف المفتاح :</translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>حدد ملف المفتاح</translation>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty password</source>
-        <translation>كلمة المرور فارغة</translation>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>هل تريد حقًا استخدام مُدخل فارغ ككلمة مرور؟</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Different passwords supplied.</source>
-        <translation>توفير كلمات السر مختلفة.</translation>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>أخفق إعداد %1 كملف مفتاح:
-%2</translation>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Legacy key file format</source>
-        <translation>تنسيق ملف المفتاح القديم</translation>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation type="unfinished"/>
     </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>
-    </message>
-    <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>إستبدال المفتاح الرئيسي أخفق: لم يُدرج YubiKey.</translation>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -644,14 +841,6 @@ Please consider generating a new key file.</source>
         <translation>غير موجود في ملف CSV</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>إسم الحقل فارغ</translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>العمود </translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>مُستورد من ملف CSV</translation>
     </message>
@@ -660,48 +849,84 @@ Please consider generating a new key file.</source>
         <translation>البيانات الأصلية:</translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>تم إكتشاف خطأ (أخطاء) في ملف CSV !</translation>
+        <source>Error</source>
+        <translation>خطأ</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation>المزيد من الرسائل تم تخطيها]</translation>
+        <source>Empty fieldname %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>خطأ</translation>
+        <source>column %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>إستيراد CSV: الكاتب يحتوي أخطاء:
-</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>خطأ</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>تعذر حساب المفتاح الرئيسي</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
-        <translation><numerusform>%n بت،</numerusform><numerusform>%n بت،</numerusform><numerusform>%n بت،</numerusform><numerusform>%n بت،</numerusform><numerusform>%n بتات،</numerusform><numerusform>%n بت،</numerusform></translation>
+        <source>%n column(s)</source>
+        <translation><numerusform>%n عمود</numerusform><numerusform>%n عمود</numerusform><numerusform>%n عمود</numerusform><numerusform>%n عمود</numerusform><numerusform>%n عمود</numerusform><numerusform>%n عمود</numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
-        <translation><numerusform>%n صف،</numerusform><numerusform>%n صف،</numerusform><numerusform>%n صف،</numerusform><numerusform>%n صف،</numerusform><numerusform>%n صف،</numerusform><numerusform>%n صف،</numerusform></translation>
+        <source>%n byte(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
-        <translation><numerusform>%n عمود</numerusform><numerusform>%n عمود</numerusform><numerusform>%n عمود</numerusform><numerusform>%n عمود</numerusform><numerusform>%n عمود</numerusform><numerusform>%n عمود</numerusform></translation>
+        <source>%n row(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>الجذر</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -731,14 +956,6 @@ Please consider generating a new key file.</source>
         <translation>استجابة التحدي:</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>يتعذر فتح قاعدة البيانات.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>يتعذر فتح ملف المفتاح</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation>تنسيق ملف المفتاح القديم</translation>
     </message>
@@ -768,105 +985,168 @@ Please consider generating a new key file.</source>
         <source>Select key file</source>
         <translation>إختر ملف المفتاح</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>إصلاح قاعدة البيانات</translation>
+        <source>TouchID for quick unlock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>خطأ</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>يتعذر فتح ملف المفتاح</translation>
+        <source>Can't open key file:
+%1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>فتح قاعدة البيانات غير ممكن.</translation>
+        <source>Passwords</source>
+        <translation>كلمه السر</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
+    <message>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>العام</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>قاعدة البيانات فُتحت بشكل جيد. لا يوجد شيء لفعله.</translation>
+        <source>Security</source>
+        <translation>الأمان</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>نجاح</translation>
+        <source>Master Key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>تم إصلاح قاعدة البيانات بنجاح
-يمكنك الآن حفظها.</translation>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>تعذر إصلاح قاعدة البيانات.</translation>
+        <source>Browser Integration</source>
+        <translation>تكامل المتصفح</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>العام</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>التعمية</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>&amp;فصل جميع المتصفحات</translation>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
-        <translation>عدد الجولات عالي جدًا</translation>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation type="unfinished"/>
     </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>أنت تستخدم عدد كبير جدًا من جولات تحول المفتاح مع Argon2.
-
-إذا احتفظت بهذا الرقم، فقد تستغرق قاعدة البيانات ساعات أو أيام (أو حتى أطول) لفتحها!</translation>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Understood, keep number</source>
-        <translation>مفهوم، حافظ على العدد</translation>
+        <source>Stored keys</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>ألغ</translation>
+        <source>Remove</source>
+        <translation>إزالة</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
-        <translation>عدد الجولات منخفض جدًا</translation>
+        <source>Delete the selected key?</source>
+        <translation type="unfinished"/>
     </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>أنت تستخدم عدد قليل جدًا من جولات تحول المفتاح مع  AES-KDF.
-
-إذا احتفزت بهذا الرقم، قد تكون قاعدة البيانات الخاصة بك من السهل جدًا كسرها!</translation>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KDF unchanged</source>
-        <translation>KDF دون تغيير</translation>
+        <source>Key</source>
+        <translation>المفتاح</translation>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
-        <translation>أخفق تحويل المفتاح مع معطيات KDF الجديدة; KDF دون تغيير.</translation>
+        <source>Value</source>
+        <translation>القيمة</translation>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: لم يُعثر على أية مفاتيح</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: حُذِفت المفاتيح من قاعدة البيانات</translation>
     </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
-        <translation><numerusform> MiB</numerusform><numerusform> MiB</numerusform><numerusform> MiB</numerusform><numerusform> MiB</numerusform><numerusform> MiB</numerusform><numerusform> MiB</numerusform></translation>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>إزالة الصلاحيات المخزنة...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>إجهاض </translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: حُذفت الصلاحيات</translation>
     </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
-        <translation><numerusform>موضوع</numerusform><numerusform>موضوع</numerusform><numerusform>موضوع</numerusform><numerusform>مواضيع</numerusform><numerusform>مواضيع</numerusform><numerusform>مواضيع</numerusform></translation>
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: لا يوجد مُدخل مع الصلاحيات الموجودة!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>لا تحتوي قاعدة البيانات النشطة على إدخال مع صلاحيات.</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
     </message>
 </context>
 <context>
@@ -903,6 +1183,113 @@ If you keep this number, your database may be too easy to crack!</source>
         <source>Parallelism:</source>
         <translation>التماثل:</translation>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>عدد الجولات عالي جدًا</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>أنت تستخدم عدد كبير جدًا من جولات تحول المفتاح مع Argon2.
+
+إذا احتفظت بهذا الرقم، فقد تستغرق قاعدة البيانات ساعات أو أيام (أو حتى أطول) لفتحها!</translation>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation>مفهوم، حافظ على العدد</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>ألغ</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>عدد الجولات منخفض جدًا</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>أنت تستخدم عدد قليل جدًا من جولات تحول المفتاح مع  AES-KDF.
+
+إذا احتفزت بهذا الرقم، قد تكون قاعدة البيانات الخاصة بك من السهل جدًا كسرها!</translation>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation>KDF دون تغيير</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation>أخفق تحويل المفتاح مع معطيات KDF الجديدة; KDF دون تغيير.</translation>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -952,91 +1339,110 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>الجذر</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>قاعدة بيانات KeePass 2</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>كل الملفات</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>فتح قاعدة بيانات</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>الملف غير موجود!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>فتح قاعدة البيانات غير ممكن.</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>الملف تم فتحه بوضع القراءة فقط.</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>فتح ملف CSV</translation>
+        <source>Add additional protection...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>ملف CSV</translation>
+        <source>No encryption key added</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>جميع الملفات (*)</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>دمج قاعدة بيانات</translation>
+        <source>No password set</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>فتح قاعدة بيانات KeePass 1</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 type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>قاعدة بيانات KeePass 1</translation>
+        <source>Unknown error</source>
+        <translation>خطأ مجهول</translation>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>إغلاق؟</translation>
+        <source>Failed to change master key</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; في وضع التحرير.
-تجاهل التغييرات وإلاغلاق على أي حال؟</translation>
+        <source>Database Name:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>حفظ التغييرات؟</translation>
+        <source>Description:</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>&quot;%1&quot; مُعدل.
-هل تريد حفظ التغييرات؟</translation>
+        <source>KeePass 2 Database</source>
+        <translation>قاعدة بيانات KeePass 2</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>فشل كتابة قاعدة البيانات.</translation>
+        <source>All files</source>
+        <translation>كل الملفات</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>كلمه السر</translation>
+        <source>Open database</source>
+        <translation>فتح قاعدة بيانات</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>حفظ قاعدة البيانات باسم</translation>
+        <source>CSV file</source>
+        <translation>ملف CSV</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>دمج قاعدة بيانات</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>فتح قاعدة بيانات KeePass 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>قاعدة بيانات KeePass 1</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1047,40 +1453,40 @@ Save changes?</source>
         <translation>تعذر كتابة ملف CSV.</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>قاعدة بيانات جديدة</translation>
+        <source>Database creation error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>locked</source>
-        <translation>مقفل</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 type="unfinished"/>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>قفل قاعدة بيانات</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>لا يمكن إقفال قاعدة البيانات ريثما تقوم بتغييرها.
-اضغط على إلغاء لكي تقوم بإنهاء التغييرات أو إلغائها.</translation>
+        <source>Select CSV file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>قاعدة البيانات هذه قد تم تعديلها.
-هل تريد حفظ قاعدة البيانات قبل قفلها؟
-وإلا فإنك ستخسر التغييرات التي قمت بها.</translation>
+        <source>New Database</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disable safe saves?</source>
-        <translation>هل تريد تعطيل الحفظ الآمن؟</translation>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
     </message>
     <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 قد فشل في حفظ قاعدة البيانات عدة مرات. هذا غالبا ما يحدث بسبب خدمات مزامنة الملف حيث تقوم بمنع الكتابة على الملف.
-أتريد إلغاء خيار الحفظ الامن ثم المحاولة مرة أخرى؟</translation>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1090,37 +1496,13 @@ Disable safe saves and try again?</source>
         <translation>يبْحَث...</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>تغيير كلمة السر الرئيسية</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>حذف المدخل؟</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>هل تريد حقًا حذف الإدخال &quot;%1&quot; بشكل دائم؟</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>حذف المدخلات؟</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>هل تريد حقًا حذف %1 إدخالات بشكل دائم؟</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>نقل المُدخل إلى سلة المهملات؟</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation>هل تريد حقًا نقل الإدخال &quot;%1&quot; إلى سلة المهملات؟</translation>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>نقل المُدخلات إلى سلة المهملات؟</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation><numerusform>هل تريد حقًا نقل %n مُدخل إلى سلة المهملات؟</numerusform><numerusform>هل تريد حقًا نقل %n مُدخل إلى سلة المهملات؟</numerusform><numerusform>هل تريد حقًا نقل %n مُدخل إلى سلة المهملات؟</numerusform><numerusform>هل تريد حقًا نقل %n مُدخل إلى سلة المهملات؟</numerusform><numerusform>هل تريد حقًا نقل %n مُدخل إلى سلة المهملات؟</numerusform><numerusform>هل تريد حقًا نقل %n مُدخل إلى سلة المهملات؟</numerusform></translation>
@@ -1138,18 +1520,10 @@ Disable safe saves and try again?</source>
         <translation>تذكر ما اخترته</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>حذف المجموعة؟</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>هل تريد حقًا حذف المجموعة &quot;%1&quot; بشكل دائم؟</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>تعذر حساب المفتاح الرئيسي</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>لا يوجد قاعدة بيانات حالية.</translation>
     </message>
@@ -1184,10 +1558,6 @@ Do you want to merge your changes?</source>
 هل تريد دمج التغييرات؟</translation>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>تعذر فتح ملف قاعدة البيانات الجديد أثناء محاولة إعادة تحميل قاعدة البيانات هذه تلقائيًا.</translation>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>إفراغ سلة المهملات؟</translation>
     </message>
@@ -1195,88 +1565,104 @@ Do you want to merge your changes?</source>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>هل أنت متأكد من حذف كل شيء من سلة المهملات نهائيًا؟</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>إنشاء رمز TOTP</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>إغلاق</translation>
+        <source>File opened in read only mode.</source>
+        <translation>الملف تم فتحه بوضع القراءة فقط.</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>العام</translation>
+        <source>Lock Database?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password</source>
-        <translation>كلمه السر</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>URL</source>
-        <translation>رابط</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot; مُعدل.
+هل تريد حفظ التغييرات؟</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>الإنتهاء</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Username</source>
-        <translation>اسم المستخدم</translation>
+        <source>Save changes?</source>
+        <translation>حفظ التغييرات؟</translation>
     </message>
     <message>
-        <source>Autotype</source>
-        <translation>Auto-Type</translation>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>جاري البحث</translation>
+        <source>Disable safe saves?</source>
+        <translation>هل تريد تعطيل الحفظ الآمن؟</translation>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>الخصائص</translation>
+        <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 قد فشل في حفظ قاعدة البيانات عدة مرات. هذا غالبا ما يحدث بسبب خدمات مزامنة الملف حيث تقوم بمنع الكتابة على الملف.
+أتريد إلغاء خيار الحفظ الامن ثم المحاولة مرة أخرى؟</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>المرفقات</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>ملاحظات</translation>
+        <source>Passwords</source>
+        <translation>كلمه السر</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>النافذة</translation>
+        <source>Save database as</source>
+        <translation>حفظ قاعدة البيانات باسم</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>التسلسل</translation>
+        <source>KeePass 2 Database</source>
+        <translation>قاعدة بيانات KeePass 2</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>بحث</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>مسح</translation>
+        <source>Delete group</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Never</source>
-        <translation>أبدًا</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[محمي]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>مُعطل</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>مُفعل</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1350,22 +1736,10 @@ Do you want to merge your changes?</source>
         <translation>خاصية جديدة</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>تأكيد الحذف</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>هل أنت متاكد من إزالة هذه الخاصية؟</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[محمي]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation>إضغط استكشاف للعرض او التحرير</translation>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>غدا</translation>
     </message>
@@ -1378,10 +1752,6 @@ Do you want to merge your changes?</source>
         <translation><numerusform>%n شهر</numerusform><numerusform>شهر</numerusform><numerusform>شهرين</numerusform><numerusform>%n شهور</numerusform><numerusform>%n شهور</numerusform><numerusform>%n شهور</numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>سنة واحدة</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation>تطبيق كلمة المرور المولدة؟</translation>
     </message>
@@ -1393,6 +1763,26 @@ Do you want to merge your changes?</source>
         <source>Entry updated successfully.</source>
         <translation>حُدث المُدخل بنجاح.</translation>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1638,6 +2028,81 @@ Do you want to merge your changes?</source>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>النموذج</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>كلمه السر:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1695,10 +2160,6 @@ Do you want to merge your changes?</source>
         <translation>تعذر جلب رمز المفضلة.</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>تلميح: يمكنك تمكين قوقل كإجراء إضافي ضمن ألادوات&gt;الإعدادات&gt;الأمان</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>الصور</translation>
     </message>
@@ -1707,14 +2168,6 @@ Do you want to merge your changes?</source>
         <translation>كل الملفات</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>اختر صورة</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read icon</source>
-        <translation>لا يمكن قراءة الرمز</translation>
-    </message>
-    <message>
         <source>Custom icon already exists</source>
         <translation>الرمز المخصص موجود بالفعل</translation>
     </message>
@@ -1723,8 +2176,36 @@ Do you want to merge your changes?</source>
         <translation>تأكيد الحذف</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>هذا الرمز مستخدم من قبل %1 إدخالات، وسيتم إستبداله بالرمز الإفتراضي. هل أنت متأكد من حذفه؟</translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1775,9 +2256,8 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation> - إستنساخ</translation>
+        <source>%1 - Clone</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1822,10 +2302,6 @@ This may cause the affected plugins to malfunction.</source>
         <translation><numerusform>هل أنت متأكد من حذف %n مرفق؟</numerusform><numerusform>هل أنت متأكد من حذف %n مرفق؟</numerusform><numerusform>هل أنت متأكد من حذف %n مرفق؟</numerusform><numerusform>هل أنت متأكد من حذف %n مرفقات؟</numerusform><numerusform>هل أنت متأكد من حذف %n مرفق؟</numerusform><numerusform>هل أنت متأكد من حذف %n مرفقات؟</numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>تأكيد الحذف</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>حفظ المرفقات</translation>
     </message>
@@ -1862,10 +2338,13 @@ This may cause the affected plugins to malfunction.</source>
 %1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>تعذر فتح الملفات:
-%1</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1949,6 +2428,106 @@ This may cause the affected plugins to malfunction.</source>
         <source>Attachments</source>
         <translation>المرفقات</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>إنشاء رمز TOTP</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>إغلاق</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>العام</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>اسم المستخدم</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>كلمه السر</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>الإنتهاء</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>رابط</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>الخصائص</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>المرفقات</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>ملاحظات</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Auto-Type</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>النافذة</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>التسلسل</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>جاري البحث</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>بحث</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>مسح</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>أبدًا</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[محمي]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>مُفعل</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>مُعطل</translation>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EntryView</name>
@@ -1987,6 +2566,19 @@ This may cause the affected plugins to malfunction.</source>
         <source>Recycle Bin</source>
         <translation>سلة المهملات</translation>
     </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>HostInstaller</name>
@@ -2000,61 +2592,6 @@ This may cause the affected plugins to malfunction.</source>
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>الطول:</translation>
-    </message>
-    <message>
-        <source>Character Types</source>
-        <translation>أنواع الرموز</translation>
-    </message>
-    <message>
-        <source>Upper Case Letters</source>
-        <translation>الحروف الكبيرة</translation>
-    </message>
-    <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
-    </message>
-    <message>
-        <source>Lower Case Letters</source>
-        <translation>أحرف صغيرة</translation>
-    </message>
-    <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
-    </message>
-    <message>
-        <source>Numbers</source>
-        <translation>أرقام</translation>
-    </message>
-    <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
-    </message>
-    <message>
-        <source>Special Characters</source>
-        <translation>محارف خاصة</translation>
-    </message>
-    <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
-    </message>
-    <message>
-        <source>Exclude look-alike characters</source>
-        <translation>استبعاد الرموز التي تبدو على حد سواء</translation>
-    </message>
-    <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>تأكد من أن كلمة المرور تحتوي على أحرف من كل مجموعة</translation>
-    </message>
-    <message>
-        <source>Extended ASCII</source>
-        <translation>تمديد ASCII</translation>
-    </message>
-</context>
-<context>
     <name>KMessageWidget</name>
     <message>
         <source>&amp;Close</source>
@@ -2079,6 +2616,26 @@ This may cause the affected plugins to malfunction.</source>
         <source>Wrong key or database file is corrupt.</source>
         <translation>المفتاح أو ملف قاعدة البيانات معطوب.</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation>رؤوس قاعدة البيانات مفقودة</translation>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>حجم معرف الرأس غير صحيح</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>رأس حقل الطول غير صحيح</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>طول بيانات الرأس غير صحيح</translation>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2238,10 +2795,6 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation>طول تشفير uuid غير صحيح</translation>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation>تشفير غير مدعوم</translation>
     </message>
@@ -2295,6 +2848,18 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Unsupported KeePass 2 database version.</source>
         <translation>إصدار قاعدة بيانات 2 KeePass غير مدعوم.</translation>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2367,10 +2932,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>أرِخ العنصر مسخدمًا معرف فريد مختلف</translation>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation>يتعذر فك تشفير سلسلة الإدخال</translation>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation>عُثر على خاصية مخصصة مكررة</translation>
     </message>
@@ -2419,6 +2980,12 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation>تعذر فك ضغط القيمة الثنائية</translation>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2582,28 +3149,126 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Invalid entry field type</source>
         <translation>نوع حقل الإدخال غير صحيح</translation>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>ملف القفل الحالي المثيل غير صحيح. سيُطلق مثيل جديد.</translation>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>تعذر إنشاء ملف القفل. وضع المثيل الأحادي مُعطل.</translation>
+        <source>Import from</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>نسخة أخرى من KeePassXC قيد التشغيل.</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>خطأ فادح أثناء اختبار وظائف التشفير.</translation>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - خطأ</translation>
+        <source>Key Component</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>ألغ</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>تصّفح</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>توليد</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>ملفات المفتاح</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>كل الملفات</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>إنشاء ملف مفتاح...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>حدد ملف المفتاح</translation>
     </message>
 </context>
 <context>
@@ -2617,10 +3282,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;قواعد البيانات الحديثة</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>إستيراد</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation>&amp;مساعدة</translation>
     </message>
@@ -2629,14 +3290,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>المُدخلات</translation>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>نسخ الخاصية إلى الحافظة</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation>كلمة مرور لمرة واحدة تعتمد على الوقت</translation>
-    </message>
-    <message>
         <source>&amp;Groups</source>
         <translation>&amp;المجموعات</translation>
     </message>
@@ -2665,30 +3318,10 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;إغلاق قاعدة البيانات</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>&amp;إنشاء قاعدة بيانات</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>دمج من قاعدة بيانات KeePassX</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>&amp;إضافة مُدخل جديد</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>&amp;مشاهدة/تعديل مدخل</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>&amp;حذف مدخل</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>&amp;إضافة مجموعة جديدة</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>&amp;تعديل المجموعة</translation>
     </message>
@@ -2701,14 +3334,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>حفظ قاعدة البيانات بأسم...</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>تغيير &amp;المفتاح الرئيسي...</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>&amp;إعدادات قاعدة البيانات</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>إعدادات قاعدة البيانات</translation>
     </message>
@@ -2717,10 +3342,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;إستنساخ مدخل</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>&amp;بحث</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>نسخ &amp;اسم المستخدم</translation>
     </message>
@@ -2729,10 +3350,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>نسخ اسم المستخدم إلى الحافظة</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>نسخ كلمة المرور</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>نسخ كلمة المرور إلى الحافظة</translation>
     </message>
@@ -2745,14 +3362,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>مولد كلمة السر</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation>&amp;تنفيذ الطباعة التلقائية</translation>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>&amp;فتح الرابط</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>&amp;قفل قواعد البيانات</translation>
     </message>
@@ -2785,22 +3394,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;تصدير كملف CSV...</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>إستيراد قاعدة بيانات KeePass 1...</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>إستيراد ملف CSV...</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>إصلاح قاعدة البيانات...</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>إظهار TOTP</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>إعداد TOTP...</translation>
     </message>
@@ -2821,14 +3414,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>خطأ في الوصول لملف التكوين %1</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation>&lt;p&gt;يبدو أنك تستخدم KeePassHTTP كتكامل للمتصفح. تم إهمال هذه الميزة وستتم إزالتها في المستقبل.&lt;br&gt;يرجى التبديل إلى KeePassXC-Browser! للحصول على مساعدة بالإستبدال، إنتقل إلى دليل الإستبدال&lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;&lt;/a&gt; (التحذير %1 من 3).&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>للقراءة فقط</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>الإعدادات</translation>
     </message>
@@ -2841,36 +3426,277 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>إغلاق KeePassXC</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>قاعدة بيانات KeePass 2</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>يرجى لمس الزر المتواجد على YubiKey!</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>كل الملفات</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation>تحذير: أنت تستخدم بناء غير مستقر من KeePassXC!
+هناك خطر كبير للعطب، حافظ على أخذ نسخة إحتياطية لقاعدة البيانات.
+ليس المقصود من هذا الإصدار للإستخدام الأساسي.</translation>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>فتح قاعدة بيانات</translation>
+        <source>&amp;Donate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>حفظ قاعدة البيانات المُصَحَّحة</translation>
+        <source>Report a &amp;bug</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>فشل كتابة قاعدة البيانات.</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>يرجى لمس الزر المتواجد على YubiKey!</translation>
+        <source>&amp;Import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
-        <translation>تحذير: أنت تستخدم بناء غير مستقر من KeePassXC!
-هناك خطر كبير للعطب، حافظ على أخذ نسخة إحتياطية لقاعدة البيانات.
-ليس المقصود من هذا الإصدار للإستخدام الأساسي.</translation>
+        <source>Copy att&amp;ribute...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>الجذر</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2973,125 +3799,34 @@ This version is not meant for production use.</source>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation>الحوار</translation>
-    </message>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>هذا مطلوب للوصول إلى قواعد البيانات الخاصة بك من ChromeIPass أو PassIFox</translation>
-    </message>
-    <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>تفعيل خادم KeePassHTTP</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>العام</translation>
-    </message>
-    <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>عرض إشعار عند طلب بيانات الإعتماد</translation>
-    </message>
-    <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>لا تعرض سوى أفضل التطابقات للرابط المحدد بدلًا من جميع الإدخالات للنطاق بأكمله.</translation>
-    </message>
-    <message>
-        <source>&amp;Return only best matching entries</source>
-        <translation>&amp;عرض أفضل إدخالات مطابقة فقط</translation>
-    </message>
-    <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>طلب إلغاء القفل في حال تم الإقفال</translation>
-    </message>
-    <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation>يُسترجع الإدخالات مع نفس المخطط (http://, https://, ftp://, ...) فقط.</translation>
-    </message>
-    <message>
-        <source>&amp;Match URL schemes</source>
-        <translation>&amp;مطابقة مخططات الروابط</translation>
-    </message>
-    <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>فرز الإدخالات المطابقة حسب اسم المستخدم</translation>
-    </message>
-    <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>فرز الإدخالات المطابقة حسب العنوان</translation>
-    </message>
-    <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>إزالة جميع مفاتيح التشفير المشتركة من قاعدة البيانات النشطة</translation>
-    </message>
-    <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>إزالة كافة الصلاحيات المخزنة من المُدخلات في قاعدة البيانات النشطة</translation>
-    </message>
-    <message>
-        <source>Password Generator</source>
-        <translation>مولد كلمة السر</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>متقدم</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>السماح دائمًا &amp;بالوصول للمُدخلات</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>السماح دائمًا &amp;بتحديث المُدخلات</translation>
-    </message>
-    <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>قاعدة البيانات المحددة هي التي يجب تتصل مع العميل فقط.</translation>
-    </message>
-    <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>بحث في جميع قواعد البيانات المفتوحة لمطابقة الإدخالات</translation>
-    </message>
-    <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>إنشاء او تحديث حقول التسلسل تلقائيًا غير مدعوم.</translation>
-    </message>
-    <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>&amp;جلب حقول التسلسل المتقدمة التي تبدأ ب &quot;KPH: &quot;</translation>
-    </message>
-    <message>
-        <source>HTTP Port:</source>
-        <translation>منفذ HTTP:</translation>
+        <source>Enter password:</source>
+        <translation>أدخل كلمة السر:</translation>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>المنفذ الافتراضي: 19455</translation>
+        <source>Confirm password:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC سيعمل على هذا المنفذ في 127.0.0.1</translation>
+        <source>Password</source>
+        <translation>كلمه السر</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;تحذير:&lt;/b&gt; قد تكون الخيارات التالية خطيرة!</translation>
+        <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"/>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;يبدو أنك تستخدم KeePassHTTP كتكامل للمتصفح. تم إهمال هذه الميزة وستتم إزالتها في المستقبل.&lt;br&gt;يرجى التبديل إلى KeePassXC-Browser! للحصول على مساعدة بالإستبدال، &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;إنتقل إلى دليل الإستبدال&lt;/a&gt;.&lt;/p&gt;</translation>
+        <source>Password cannot be empty.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>لا يمكن ربط المنافذ المميزة</translation>
+        <source>Passwords do not match.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>لا يمكن ربط المنافذ المميزة أقل من 1024!
-استخدم المنفذ الإفتراضي 19455.</translation>
+        <source>Generate master password</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3162,18 +3897,10 @@ Using default port 19455.</source>
         <translation>قائمة الكلمات:</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>عدد الكلمات:</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>فاصل الكلمة:</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>توليد</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>نسخة</translation>
     </message>
@@ -3186,10 +3913,6 @@ Using default port 19455.</source>
         <translation>إغلاق</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>تطبيق</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>Entropy: %1 bit</translation>
     </message>
@@ -3217,6 +3940,171 @@ Using default port 19455.</source>
         <comment>Password quality</comment>
         <translation>ممتازة</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>متقدم</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>حذف</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>إزالة</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>تعطيل</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3237,34 +4125,18 @@ Using default port 19455.</source>
         <translation>لا يمكن فك تشفير الرسالة</translation>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
-        <translation>نفذ الوقت أو لا يمكن الإتصال على KeePassXC</translation>
-    </message>
-    <message>
         <source>Action cancelled or denied</source>
         <translation>أُلغي الإجراء أو رُفض</translation>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation>لا يمكن تشفير الرسالة أو لم يتم العثور على المفتاح العام. هل تم تمكين المراسلة الأساسية في KeePassXC؟</translation>
-    </message>
-    <message>
         <source>KeePassXC association failed, try again</source>
         <translation>تعذر إرتباط KeePassXC، حاول مرة أخرى</translation>
     </message>
     <message>
-        <source>Key change was not successful</source>
-        <translation>لم يكن تغيير المفتاح ناجحًا</translation>
-    </message>
-    <message>
         <source>Encryption key is not recognized</source>
         <translation>لم يتم التعرف على مفتاح التشفير</translation>
     </message>
     <message>
-        <source>No saved databases found</source>
-        <translation>لم يتم العثور على قواعد بيانات محفوظة</translation>
-    </message>
-    <message>
         <source>Incorrect action</source>
         <translation>إجراء غير صحيح</translation>
     </message>
@@ -3390,10 +4262,6 @@ Using default port 19455.</source>
         <translation>ادخل كلمة المرور لإلغاء قفل %1:</translation>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation>تعذر تحميل ملف المفتاح %1 : %2</translation>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3478,12 +4346,6 @@ Available commands:
         <translation>خطأ القراءة من الجهاز</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>ملف فارغ !
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation>سلسلة غير صحيحة</translation>
     </message>
@@ -3492,30 +4354,6 @@ Available commands:
         <translation>إغلاق الإقتباس مفقود</translation>
     </message>
     <message>
-        <source>AES: 256-bit</source>
-        <translation>AES: 256-bit</translation>
-    </message>
-    <message>
-        <source>Twofish: 256-bit</source>
-        <translation>Twofish: 256-bit</translation>
-    </message>
-    <message>
-        <source>ChaCha20: 256-bit</source>
-        <translation>ChaCha20: 256-bit</translation>
-    </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – مستحسن)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 4)</source>
-        <translation>AES-KDF (KDBX 4)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 3.1)</source>
-        <translation>AES-KDF (KDBX 3.1)</translation>
-    </message>
-    <message>
         <source>Group</source>
         <translation>المجموعة</translation>
     </message>
@@ -3544,10 +4382,6 @@ Available commands:
         <translation>أُنشئت</translation>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
-        <translation>تكامل المتصفح القديم</translation>
-    </message>
-    <message>
         <source>Browser Integration</source>
         <translation>تكامل المتصفح</translation>
     </message>
@@ -3576,10 +4410,6 @@ Available commands:
         <translation>عدد الكلمات لعبارة مرور diceware.</translation>
     </message>
     <message>
-        <source>count</source>
-        <translation>العدد</translation>
-    </message>
-    <message>
         <source>Wordlist for the diceware generator.
 [Default: EFF English]</source>
         <translation>قائمة الكلمات لمولد diceware.
@@ -3590,28 +4420,438 @@ Available commands:
         <translation>إنشاء كلمة مرور عشوائية جديدة.</translation>
     </message>
     <message>
-        <source>Length of the generated password.</source>
-        <translation>طول كلمة المرور المولدة.</translation>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
-        <translation>إستخدام الأحرف الصغيرة في كلمة المرور المُنشئة.</translation>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
-        <translation>إستخدام الأحرف الكبيرة في كلمة المرور المُنشئة.</translation>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
-        <translation>إستخدام الأرقام في كلمة المرور المُنشئة.</translation>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
-        <translation>إستخدام رموز مخصصة في كلمة المرور المُنشئة.</translation>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
-        <translation>إستخدام ASCII الموسع في كلمة المرور التي المُنشئة.</translation>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation>العدد</translation>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256-bit</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256-bit</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256-bit</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – مستحسن)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>حذف مُدخل من قاعدة البيانات.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>مسار المُدخل التي ستحذف.</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>ملف القفل الحالي المثيل غير صحيح. سيُطلق مثيل جديد.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>تعذر إنشاء ملف القفل. وضع المثيل الأحادي مُعطل.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - مدير كلمات المرور لعدة أنظمة</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>أسماء ملفات قواعد بيانات كلمات المرور للفتح  (*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>مسار ملف الاعدادات المخصص</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>ملف مفتاح قاعدة البيانات</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>قراءة كلمة سر قاعدة البيانات من الدخل القياسي &quot;stdin&quot;</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation>زر النافذة الأم</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>نسخة أخرى من KeePassXC قيد التشغيل.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>خطأ فادح أثناء اختبار وظائف التشفير.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - خطأ</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3649,12 +4889,98 @@ Available commands:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
+    <message>
+        <source>Agent connection failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <source>Search...</source>
-        <translation>البحث...</translation>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
+        <source>Modifiers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
         <source>Search</source>
         <translation>بحث</translation>
     </message>
@@ -3663,314 +4989,316 @@ Available commands:
         <translation>مسح</translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation>حالة الحساسية</translation>
-    </message>
-    <message>
         <source>Limit search to selected group</source>
         <translation>حدد البحث في المجموعة المحددة</translation>
     </message>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Service</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC: طلب مصادقة مفتاح جديد</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation>لقد تلقيت طلب ارتباط للمفتاح أعلاه.
-إذا كنت ترغب في السماح له بالوصول إلى قاعدة بيانات KeePassXC
-إعطه اسم فريد لمعرفته وقبوله.</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: الكتابة على المفتاح الحالي؟</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>مفتاح التشفير المشترك مع إسم &quot;%1&quot; موجود بالفعل.
-هل تريد الكتابة عليه؟</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: تحديث المُدخل</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>هل تريد تحديث المعلومات في %1 - %2؟</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: قاعدة البيانات أقفلت!</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>قاعدة البيانات هذه قد أقفلت!
-يرجى إلغاء قفل قاعدة البيانات المحددة أو اختيار واحدة أخرى تكون مفتوحة.</translation>
+        <source>Key:</source>
+        <translation>المفتاح:</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: حُذِفت المفاتيح من قاعدة البيانات</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation><numerusform>حذف %n مفتاح تشفير من إعدادات KeePassX/Http.</numerusform><numerusform>حذف %n مفتاح تشفير من إعدادات KeePassX/Http.</numerusform><numerusform>حُذفت %n مفتاح تشفير من إعدادات KeePassX/Http.</numerusform><numerusform>حُذفت %n مفتاح تشفير من إعدادات KeePassX/Http.</numerusform><numerusform>حُذفت %n مفتاح تشفير من إعدادات KeePassX/Http.</numerusform><numerusform>حُذفت %n مفتاح تشفير من إعدادات KeePassX/Http.</numerusform></translation>
+        <source>Generate</source>
+        <translation>توليد</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: لم يُعثر على أية مفاتيح</translation>
+        <source>Import</source>
+        <translation>إستيراد</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>لم يُعثر على مفاتيح التشفير المشتركة في إعدادات KeePassHttp.</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: الإعدادات غير متاحة!</translation>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>لا تحتوي قاعدة البيانات النشطة على إدخال لإعدادات KeePassHttp.</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>إزالة الصلاحيات المخزنة...</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>إجهاض </translation>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: حُذفت الصلاحيات</translation>
+        <source>Remove</source>
+        <translation>إزالة</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation><numerusform>حُذفت الصلاحيات من %n مدخل.</numerusform><numerusform>حُذفت الصلاحيات من %n مدخل.</numerusform><numerusform>حُذفت الصلاحيات من %n مدخل.</numerusform><numerusform>حُذفت الصلاحيات من %n مدخل.</numerusform><numerusform>حُذفت الصلاحيات من %n مدخل.</numerusform><numerusform>حُذفت الصلاحيات من %n مدخلات.</numerusform></translation>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: لا يوجد مُدخل مع الصلاحيات الموجودة!</translation>
+        <source>Status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>لا تحتوي قاعدة البيانات النشطة على إدخال مع صلاحيات.</translation>
+        <source>Fingerprint</source>
+        <translation>البصمة</translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
-        <translation>إعدادات التطبيق</translation>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>العام</translation>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>الأمان</translation>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>خطأ في الوصول لملف التكوين %1</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>الإعدادات الأساسية</translation>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>شغل تطبيق واحد فقط من KeePassXC</translation>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>تذكر قواعد البيانات الأخيرة</translation>
+        <source>All files</source>
+        <translation>كل الملفات</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>تذكر الملفات الرئيسية الأخيرة و قواعد الأمن</translation>
+        <source>Select path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>إستعادة قواعد البيانات السابقة عند بدء التشغيل</translation>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>الحفظ تلقائيًا عند الإغلاق</translation>
+        <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"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>الحفظ تلقائيًا بعد كل تعديل</translation>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>إعادة تحميل قاعدة البيانات تلقائيا عند تعديلها خارجيًا</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>تصغير عند النسخ إلى الحافظة</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>تصغير النافذة عند بدء تشغيل التطبيق</translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>استخدم رمز المجموعة عند إنشاء الإدخال</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>عدم وضع علامة على قاعدة البيانات المعدلة للتغييرات غير المتعلقة بالبيانات (مثال، توسيع المجموعات)</translation>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
-        <translation>إخفاء عرض التفاصيل</translation>
+        <source>Never</source>
+        <translation>أبدًا</translation>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>اظهر أيقونة البرنامج في صينية النظام</translation>
+        <source>Always</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>إخفاء النافذة إلى شريط المهام عند تصغيرها</translation>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
-        <translation>إخفاء النافذة إلى شريط المهام بدلًا من إغلاق التطبيق</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
-        <translation>رمز شريط المهام المظلم</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>اللغة</translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>الطباعة التلقائية</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>استخدم عنوان الإدخال لمطابقة النوافذ للطباعة التلقائية بشكل عام</translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>استخدم رابط الإدخال لمطابقة النوافذ للطباعة التلقائية بشكل عام</translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation>اسأل دائما قبل تنفيذ الطباعة التلقائية</translation>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>المفتاح العام للطباعة التلقائية</translation>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>زمن التأخير للطباعة التلقائية</translation>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation>مل.ثانية</translation>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
-        <translation>بدأ التشغيل</translation>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
-        <translation>إدارة الملفات</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation>حفظ ملفات قواعد البيانات بأمان (قد يكون غير متوافق مع Dropbox، إلخ)</translation>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
-        <translation>إحتفظ بنسخة من ملف قاعدة البيانات قبل الحفظ</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
-        <translation>إدارة الإدخالات</translation>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>العام</translation>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
-        <translation>مهلة نفاد الوقت</translation>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>امسح الذاكرة بعد</translation>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> ثانية</translation>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>أغلق قواعد البيانات بعد حالة عدم النشاط ل</translation>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>السهولة</translation>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>اقفل قواعد البيانات عندما تنقفل الجلسة أو يتم إغلاق اللابتوب</translation>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>قفل قواعد البيانات عند تصغير النافذة</translation>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>TotpDialog</name>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>لا تطلب تكرار كلمة المرور عندما تكون مرئية</translation>
+        <source>Timed Password</source>
+        <translation>كلمة مرور موقوته</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>إظهار كلمة المرور كنص إفتراضيًا</translation>
+        <source>000000</source>
+        <translation>000000</translation>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
-        <translation>إخفاء كلمات المرور في نافذة المعاينة</translation>
+        <source>Copy</source>
+        <translation>نسخ</translation>
     </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><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
     <message>
-        <source>Hide entry notes by default</source>
-        <translation>إخفاء مُدخل الملاحظات إفتراضيًا</translation>
+        <source>Copy</source>
+        <translation>نسخ</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>الخصوصية</translation>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>إستخدم قوقل كمرجع لتنزيل رموز مواقع الويب</translation>
+        <source>There was an error creating the QR code.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
-        <translation>أعد قفل قاعدة البيانات التي تم تأمينها سابقًا بعد تنفيذ الطباعة التلقائية</translation>
+        <source>Closing in %1 seconds.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation>إعداد TOTP</translation>
@@ -3992,59 +5320,84 @@ Please unlock the selected database or choose another one which is unlocked.</so
         <translation>إستخدم أعدادات مخصصة</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>ملاحظة: لاتغير هذه الإعدادات إلا إذا كنت تعلم ماذا تفعل.</translation>
+        <source>Custom Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Time step:</source>
         <translation>الخطوة الزمنية:</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8 أرقام</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> ثانية</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>حجم الكود:</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6 أرقام</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>حجم الكود:</translation>
+        <source>7 digits</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> ثانية</translation>
+        <source>8 digits</source>
+        <translation>8 أرقام</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>كلمة مرور موقوته</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>نسخ</translation>
+        <source>Close</source>
+        <translation>إغلاق</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>تنتهي في</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>ثواني</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>إلغاء قفل قاعدة البيانات</translation>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4079,42 +5432,26 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
 </context>
 <context>
-    <name>main</name>
-    <message>
-        <source>Remove an entry from the database.</source>
-        <translation>حذف مُدخل من قاعدة البيانات.</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>مسار قاعدة البيانات.</translation>
-    </message>
-    <message>
-        <source>Path of the entry to remove.</source>
-        <translation>مسار المُدخل التي ستحذف.</translation>
-    </message>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - مدير كلمات المرور لعدة أنظمة</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>أسماء ملفات قواعد بيانات كلمات المرور للفتح  (*.kdbx)</translation>
+        <source>Refresh</source>
+        <translation>تحديث</translation>
     </message>
     <message>
-        <source>path to a custom config file</source>
-        <translation>مسار ملف الاعدادات المخصص</translation>
+        <source>YubiKey Challenge-Response</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>ملف مفتاح قاعدة البيانات</translation>
+        <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"/>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>قراءة كلمة سر قاعدة البيانات من الدخل القياسي &quot;stdin&quot;</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Parent window handle</source>
-        <translation>زر النافذة الأم</translation>
+        <source>No YubiKey inserted.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_bn.ts b/share/translations/keepassx_bn.ts
index f6894492d..2aa9200a4 100644
--- a/share/translations/keepassx_bn.ts
+++ b/share/translations/keepassx_bn.ts
@@ -38,12 +38,6 @@
         <translation>ক্লিপবোর্ডে কপি করুন</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>সংস্করণ %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>পরিমার্জনা %1</translation>
     </message>
@@ -76,35 +70,48 @@ Kernel: %3 %4</source>
         <translation>KeePassXC টিম থেকে বিশেষ ধন্যবাদ debfx-কে মূল KeePassX তৈরি করার জন্য ।</translation>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
-        <translation>বিল্ড প্রকার: %1
-</translation>
+        <source>Version %1</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP অ্যাক্সেস নিশ্চিত করুন</translation>
+        <source>Build Type: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>এই সিদ্ধান্ত মনে রাখুন</translation>
+        <source>Auto-Type</source>
+        <translation>অটো-টাইপ</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>অনুমতি দিন</translation>
+        <source>Browser Integration</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>নাকচ করুন</translation>
+        <source>SSH Agent</source>
+        <translation>SSH এজেন্ট</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>%1  নিম্নলিখিত আইটেম (গুলি) এর জন্য পাসওয়ার্ড অ্যাক্সেসের অনুরোধ জানিয়েছে
-আপনি প্রবেশাধিকার অনুমতি দিতে চান তা নির্বাচন করুন।</translation>
+        <source>YubiKey</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -113,6 +120,277 @@ Please select whether you want to allow access.</source>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>SSH এজেন্ট সক্ষম করুন (পুনর্সূচনা প্রয়োজন)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>সাধারন</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>সূচনা</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>ফাইল ব্যবস্থাপনা</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation>নিরাপদে ডাটাবেস সংরক্ষণ করুন (ড্রডবক্স, এবং অন্যান্যর সাথে অসংগত হতে পারে)</translation>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation>সংরক্ষণ করার আগে ডাটাবেস ব্যাকআপ করুন</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>এন্ট্রি ব্যবস্থাপনা</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>সাধারন</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>অটো-টাইপ</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation>এমএস</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>সময় শেষ</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>ক্লিপবোর্ড পরিস্কার হবে</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>সে.</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>অব্যবহৃত থাকলে ডাটাবেস লক হবে</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>সাচ্ছন্দ্য</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>ডাটাবেস লক হবে লিড বন্ধ করলে বা সেশন লক করলে</translation>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>উইন্ডো মিনিমাইজ করলে ডাটাবেস লক হবে</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation>অটো-টাইপের পরে পূনরায় লক করুন আগের লক করা ডাটাবেস</translation>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>আবার যখন দৃশ্যমান হবে তখন পাসওয়ার্ড লাগবেনা</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>ডিফল্টভাবে এন্ট্রি নোট লুকান</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>গোপণীয়তা</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -216,6 +494,26 @@ Please select whether you want to allow access.</source>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>বাতিল</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -289,14 +587,6 @@ Please select whether you want to allow access.</source>
         <translation>সম্ভাব্য সর্ব্বোত্তম ফলাফলটি ব্যবহারকারী অনুসারে সাজান</translation>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>সকল ব্রাউজারে সংযোগ বিচ্ছিন্ন করুন</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>মনে রাখা সকল অনুমতি ভুলে যান</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>উন্নততর</translation>
     </message>
@@ -362,14 +652,6 @@ Please select whether you want to allow access.</source>
         <translation>&lt;b&gt;সতর্কতা:&lt;/b&gt; নিম্নোক্ত বিকল্পগুলি বিপজ্জনক হতে পারে।</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>এক্সিকিউটেবল ফাইল (*.exe)।। সব ফাইল (*. *)</translation>
-    </message>
-    <message>
-        <source>Executable Files (*)</source>
-        <translation>এক্সিকিউটেবল ফাইল (*)</translation>
-    </message>
-    <message>
         <source>Select custom proxy location</source>
         <translation>স্বনির্বাচিত প্রক্সি অবস্থান নির্বাচন করুন</translation>
     </message>
@@ -377,6 +659,31 @@ Please select whether you want to allow access.</source>
         <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
         <translation>আমরা দুঃখিত, কিন্তু এই মুহূর্তে স্নাপ রিলিজ  KeePassXC ব্রাউজার সমর্থন করে না।</translation>
     </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation type="unfinished"/>
+    </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: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not ask permission for HTTP &amp;Basic Auth</source>
+        <extracomment>An extra HTTP Basic Auth setting</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>BrowserService</name>
@@ -416,152 +723,43 @@ Do you want to overwrite it?</source>
         <translation>%1 - %2 এর মধ্যে তথ্য হালনাগাদ করতে চান?</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: ডাটাবেস তালাবদ্ধ !</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>সক্রিয় ডাটাবেজ বন্ধ রয়েছে।
-নির্বাচিত ডাটাবেস আনলক করুন বা খোলা আছে এমন অন্য একটি পছন্দ করুন।</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: সেটিংস সমূহ সুপ্রাপ্য নয়।</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation>সক্রিয় ডাটাবেস সেটিংসের এন্ট্রি ধারণ করে না।</translation>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: কোন কী পাওয়া যায়নি</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation>কোন শেয়ারকৃত এনক্রিপশন কী KeePassXC সেটিংসে পাওয়া যায়নি।</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: কী ডাটাবেস থেকে অপসারণ করা হয়েছে</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation><numerusform>KeePassXC সেটিংস থেকে সফলভাবে %n এনক্রিপশন key(s) অপসারণ করা হয়েছে।</numerusform><numerusform>KeePassXC সেটিংস থেকে সফলভাবে %n এনক্রিপশন key(s) অপসারণ করা হয়েছে।</numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>সঞ্চিত অনুমতিসমূহ অপসারণ করা হচ্ছে...</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>বাতিল</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: অনুমতিসমূহ অপসারণ করা হয়েছে</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation><numerusform>%N entry(s) থেকে সফলভাবে অনুমতিসমূহ অপসারণ করা হয়েছে।</numerusform><numerusform>%N entry(s) থেকে সফলভাবে অনুমতিসমূহ অপসারণ করা হয়েছে।</numerusform></translation>
-    </message>
-    <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: অনুমতিসহ কোন এন্ট্রি পাওয়া যায়নি।</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>সক্রিয় ডাটাবেজ প্রবেশের অনুমতিসহ কোর এন্ট্রি নেই।</translation>
-    </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>পাসওয়ার্ড</translation>
-    </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>পাসওয়ার্ড প্রবেশ করান:</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>পুনরায় পাসওয়ার্ড দিন:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>কী ফাইল</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>ব্রাউজ করুন</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>তৈরি করুন</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>চ্যালেঞ্জ প্রতিক্রিয়া</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>রিফ্রেশ</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>কী ফাইলগুলো</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>সকল ফাইল</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>কী ফাইল তৈরি করুন...</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>কী ফাইল তৈরি করা যায়নি: </translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>কী ফাইল নির্বাচন করুন</translation>
+        <source>Converting attributes to custom data…</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty password</source>
-        <translation>পাসাওয়ার্ড খালি আছে</translation>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>আপনি কি খালি স্ট্রিং পাসওয়ার্ড হিসেবে ব্যবহার করতে চান?</translation>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>ভিন্ন ভিন্ন পাসওয়ার্ড সরবরাহ করা হয়েছে।</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>কী ফাইল হিসেবে %1 সেট করতে ব্যর্থ হয়েছে:
- %2</translation>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Legacy key file format</source>
-        <translation>পূর্ববর্তী কী ফাইল ফরম্যাট</translation>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation type="unfinished"/>
     </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>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>মাস্টার কী পরিবর্তন হয়নি: কোন YubiKey বসানো হয়নি।</translation>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -642,14 +840,6 @@ Please consider generating a new key file.</source>
         <translation>CSV ফাইলে উপস্থিত নয়</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>খালি ফিল্ডনেম</translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>কলাম</translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>CSV ফাইল থেকে আমদানি করা।</translation>
     </message>
@@ -658,48 +848,84 @@ Please consider generating a new key file.</source>
         <translation>অরিজিনাল তথ্য: </translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>ত্রুটি (গুলি) CSV ফাইলে শনাক্ত করা হয়েছে।</translation>
+        <source>Error</source>
+        <translation>ত্রুটি</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation> একাধিক বার্তা এড়িয়ে গেছে।</translation>
+        <source>Empty fieldname %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>ত্রুটি</translation>
+        <source>column %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>CSV আমদানি: লেখক ভুল করেছেন।
-</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>ত্রুটি</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>মাস্টার কী গণনা করতে অক্ষম</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
-        <translation><numerusform>%n byte(s), </numerusform><numerusform>%n byte(s), </numerusform></translation>
+        <source>%n column(s)</source>
+        <translation><numerusform>%n column(s)</numerusform><numerusform>%n কলাম(সমূহ)</numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
-        <translation><numerusform>%n সারি (সমূহ) </numerusform><numerusform>%n সারি (সমূহ) </numerusform></translation>
+        <source>%n byte(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
-        <translation><numerusform>%n column(s)</numerusform><numerusform>%n কলাম(সমূহ)</numerusform></translation>
+        <source>%n row(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>রুট</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -729,14 +955,6 @@ Please consider generating a new key file.</source>
         <translation>চ্যালেঞ্জের জবাব:</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>ডাটাবেজ খুলে দিতে অক্ষম।</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>কী ফাইলটি খোলা যাচ্ছে না</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation>পূর্ববর্তী কী ফাইল ফরম্যাট</translation>
     </message>
@@ -765,105 +983,168 @@ Please consider generating a new key file.</source>
         <source>Select key file</source>
         <translation>কী ফাইল নির্বাচন করুন</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>ডাটাবেস মেরামত</translation>
+        <source>TouchID for quick unlock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>ত্রুটি</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>কী ফাইলটি খোলা যাচ্ছে না</translation>
+        <source>Can't open key file:
+%1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>ডাটাবেজ খুলে দিতে অক্ষম।</translation>
+        <source>Passwords</source>
+        <translation>পাসওয়ার্ডসমূহ</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
+    <message>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>সাধারন</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>ডাটাবেজ ভালোভাবে খুলেছে। কিছুই করার নেই।</translation>
+        <source>Security</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Success</source>
-        <translation>সফল</translation>
+        <source>Master Key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>ডাটাবেজ সফলভাবে মেরামত করা হয়েছে 
-এখন আপনি তা সংরক্ষণ করতে পারবেন।</translation>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>ডাটাবেস মেরামত করতে পারছে না।</translation>
+        <source>Browser Integration</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>সাধারন</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>এনক্রিপশন</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>সকল ব্রাউজারে সংযোগ বিচ্ছিন্ন করুন</translation>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
-        <translation>খুব বেশি রাউন্ড গণনা</translation>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation type="unfinished"/>
     </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>Argon2 সাথে খুব বেশি সংখ্যক রূপান্তর কী রাউন্ডের ব্যবহার করছেন।
-
-আপনি এই সংখ্যা রাখতে চাইলে, ডাটাবেস খোলার জন্য সময় নেবে কয়েক ঘন্টা বা দিন (বা তারও বেশি) ।</translation>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Understood, keep number</source>
-        <translation>বোঝা যায়, নাম্বার রাখুন</translation>
+        <source>Stored keys</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>বাতিল</translation>
+        <source>Remove</source>
+        <translation>অপসারণ করুন</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
-        <translation>রাউন্ড খুব কম সংখ্যক</translation>
+        <source>Delete the selected key?</source>
+        <translation type="unfinished"/>
     </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>আপনি খুব কম সংখ্যক রূপান্তর কী রাউন্ডের AES-KDF এর সাথে ব্যবহার করছে।
-
-যদি আপনি এই নাম্বার রাখেন, আপনার ডাটাবেজ খুব সহজেই ক্রাক হতে পারে!</translation>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KDF unchanged</source>
-        <translation>KDF অপরিবর্তিত</translation>
+        <source>Key</source>
+        <translation>কী</translation>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
-        <translation>নতুন KDF প্যারামিটার দিয়ে কী পরিবর্তন করতে ব্যর্থ হয়েছে। KDF অপরিবর্তিত।</translation>
+        <source>Value</source>
+        <translation>মান</translation>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: কোন কী পাওয়া যায়নি</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: কী ডাটাবেস থেকে অপসারণ করা হয়েছে</translation>
     </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
-        <translation><numerusform> এম-বি</numerusform><numerusform>MiB</numerusform></translation>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>সঞ্চিত অনুমতিসমূহ অপসারণ করা হচ্ছে...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>বাতিল</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: অনুমতিসমূহ অপসারণ করা হয়েছে</translation>
     </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
-        <translation><numerusform> thread(s)</numerusform><numerusform> thread(s)</numerusform></translation>
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: অনুমতিসহ কোন এন্ট্রি পাওয়া যায়নি।</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>সক্রিয় ডাটাবেজ প্রবেশের অনুমতিসহ কোর এন্ট্রি নেই।</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
     </message>
 </context>
 <context>
@@ -900,6 +1181,113 @@ If you keep this number, your database may be too easy to crack!</source>
         <source>Parallelism:</source>
         <translation>সমান্তরালভাবে:</translation>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>খুব বেশি রাউন্ড গণনা</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>Argon2 সাথে খুব বেশি সংখ্যক রূপান্তর কী রাউন্ডের ব্যবহার করছেন।
+
+আপনি এই সংখ্যা রাখতে চাইলে, ডাটাবেস খোলার জন্য সময় নেবে কয়েক ঘন্টা বা দিন (বা তারও বেশি) ।</translation>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation>বোঝা যায়, নাম্বার রাখুন</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>বাতিল</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>রাউন্ড খুব কম সংখ্যক</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>আপনি খুব কম সংখ্যক রূপান্তর কী রাউন্ডের AES-KDF এর সাথে ব্যবহার করছে।
+
+যদি আপনি এই নাম্বার রাখেন, আপনার ডাটাবেজ খুব সহজেই ক্রাক হতে পারে!</translation>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation>KDF অপরিবর্তিত</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation>নতুন KDF প্যারামিটার দিয়ে কী পরিবর্তন করতে ব্যর্থ হয়েছে। KDF অপরিবর্তিত।</translation>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -949,91 +1337,110 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>রুট</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 ডাটাবেস</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>সকল ফাইল</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>উন্মুক্ত ডাটাবেস</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>ফাইল খুঁজে পাওয়া যায়নি।</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>ডাটাবেজ খুলে দিতে অক্ষম।</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>ফাইলটি শুধুমাত্র পঠন পরিমণ্ডলে খোলা।</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>CSV ফাইল খুলুন</translation>
+        <source>Add additional protection...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>CSV ফাইল</translation>
+        <source>No encryption key added</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>সব ফাইল (*)</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>ডাটাবেস একত্রীকরণ</translation>
+        <source>No password set</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>খোলা KeePass 1 তথ্যভাণ্ডার</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 type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1 তথ্যভাণ্ডার</translation>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>বন্ধ করুন?</translation>
+        <source>Failed to change master key</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; সম্পাদনা মোডে আছে।
-পরিবর্তনগুলি পরিত্যাগ করা হবে, আর যাই হোক বন্ধ?</translation>
+        <source>Database Name:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>পরিবর্তন সংরক্ষণ করব?</translation>
+        <source>Description:</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>&apos;%1&apos; পরিবর্তিত হয়েছে।
-পরিবর্তন সংরক্ষণ করব?</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 ডাটাবেস</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>এই ডাটাবেসে লেখা ব্যর্থ হয়েছে।</translation>
+        <source>All files</source>
+        <translation>সকল ফাইল</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>পাসওয়ার্ডসমূহ</translation>
+        <source>Open database</source>
+        <translation>উন্মুক্ত ডাটাবেস</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>ডাটাবেজ হিসেবে সংরক্ষণ করুন</translation>
+        <source>CSV file</source>
+        <translation>CSV ফাইল</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>ডাটাবেস একত্রীকরণ</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>খোলা KeePass 1 তথ্যভাণ্ডার</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 তথ্যভাণ্ডার</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1044,40 +1451,40 @@ Save changes?</source>
         <translation> CSV ফাইলে লেখা ব্যর্থ হয়েছে।</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>নতুন ডাটাবেস</translation>
+        <source>Database creation error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>locked</source>
-        <translation>তালাবদ্ধ</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 type="unfinished"/>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>তালাবদ্ধ ডাটাবেস</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>আপনি বর্তমানে এটি সম্পাদনা করছেন তাই ডাটাবেস লক করতে পারছি না।
-অনুগ্রহ করে আপনার পরিবর্তনগুলো সমাপ্ত করুন বা বাতিল চাপুন।</translation>
+        <source>Select CSV file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>এই ডাটাবেজ সংশোধন করা হয়েছে।
-লক করার আগে  ডাটাবেস সংরক্ষণ করতে চান?
-তা না হলে আপনার করা কোন পরিবর্তন সংরক্ষিত হবেনা।</translation>
+        <source>New Database</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disable safe saves?</source>
-        <translation>নিরাপদ সংরক্ষণ অক্ষম?</translation>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
     </message>
     <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 একাধিক বার ডাটাবেস সংরক্ষণ করতে ব্যর্থ হয়েছে। ফাইল সিংক্রোনাইজ সেবা ফাইলটি লক ধরে রাখলে এমনটি হতে পারে।
-নিরাপদ সংরক্ষণ অক্ষম করুন এবং আবার চেষ্টা করুন।</translation>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1087,37 +1494,13 @@ Disable safe saves and try again?</source>
         <translation>সন্ধান করা হচ্ছে...</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>মাস্টার কী পরিবর্তন করুন</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>এন্ট্রি মুছে ফেলতে চান?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>আপনি কি সত্যিই এন্ট্রি &quot;%1&quot; মুছে ফেলতে চান?</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>এন্ট্রিসমূহ মুছে ফেলতে চান?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>আপনি সত্যিই  %1 এন্ট্রিসমূহ মুছে ফেলতে চান?</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>এন্ট্রি রিসাইকেল বিনে সরাবে?</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation>আপনি কি &quot;%1&quot; এন্ট্রিটি রিসাইকেল বিনে সরাতে চান?</translation>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>রিসাইকেল বিনে এন্ট্রিসমূহ সরাবেন?</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation><numerusform>আপনি কি সত্যিই %n entry(s) রিসাইকেল বিনে সরাতে চান?</numerusform><numerusform>আপনি কি সত্যিই %n এন্ট্রি(সমূহ) রিসাইকেল বিনে সরাতে চান?</numerusform></translation>
@@ -1135,18 +1518,10 @@ Disable safe saves and try again?</source>
         <translation>আমার পছন্দ মনে রাখুন</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>দল মুছে ফেলতে চান?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>আপনি কি গ্রুপ &apos;%1&apos; মুছে ফেলতে চান?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>মাস্টার কী গণনা করতে অক্ষম</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>কোন বর্তমান ডাকাবেস নেই।</translation>
     </message>
@@ -1181,10 +1556,6 @@ Do you want to merge your changes?</source>
 আপনি কি আপনার পরিবর্তন একত্রিত করতে চান?</translation>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>এই ডাটাবেস টি সয়ংক্রিয়ভাবে পূনরায় খোলার সময় নতুন ডাটাবেস খুলতে ব্যর্থ হয়েছে</translation>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>রিসাইকেল বিন খালি করুন?</translation>
     </message>
@@ -1192,88 +1563,104 @@ Do you want to merge your changes?</source>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>আপনি কি নিশ্চিত যে ,আপনি  রিসাইকেল বিন থেকে সবকিছু স্থায়ীভাবে মুছে ফেলতে চান?</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>TOTP টোকেন তৈরি করুন</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>বন্ধ করুন</translation>
+        <source>File opened in read only mode.</source>
+        <translation>ফাইলটি শুধুমাত্র পঠন পরিমণ্ডলে খোলা।</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>সাধারন</translation>
+        <source>Lock Database?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password</source>
-        <translation>পাসওয়ার্ড</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&apos;%1&apos; পরিবর্তিত হয়েছে।
+পরিবর্তন সংরক্ষণ করব?</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>মেয়াদ শেষে</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Username</source>
-        <translation>ব্যবহারকরীর নাম</translation>
+        <source>Save changes?</source>
+        <translation>পরিবর্তন সংরক্ষণ করব?</translation>
     </message>
     <message>
-        <source>Autotype</source>
-        <translation>অটোটাইপ</translation>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>সন্ধান করা হচ্ছে</translation>
+        <source>Disable safe saves?</source>
+        <translation>নিরাপদ সংরক্ষণ অক্ষম?</translation>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>বৈশিষ্ট্যাবলী</translation>
+        <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 একাধিক বার ডাটাবেস সংরক্ষণ করতে ব্যর্থ হয়েছে। ফাইল সিংক্রোনাইজ সেবা ফাইলটি লক ধরে রাখলে এমনটি হতে পারে।
+নিরাপদ সংরক্ষণ অক্ষম করুন এবং আবার চেষ্টা করুন।</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>সংযুক্তিসমূহ</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>নোটসমূহ</translation>
+        <source>Passwords</source>
+        <translation>পাসওয়ার্ডসমূহ</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>উইন্ডো</translation>
+        <source>Save database as</source>
+        <translation>ডাটাবেজ হিসেবে সংরক্ষণ করুন</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>অনুক্রম</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 ডাটাবেস</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>সন্ধান</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>পরিস্কার</translation>
+        <source>Delete group</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Never</source>
-        <translation>কখনো না</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[সংরক্ষিত]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>নিষ্ক্রিয়</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>সক্রিয়</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1347,22 +1734,10 @@ Do you want to merge your changes?</source>
         <translation>নতুন বৈশিষ্ট্য</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>মূছে ফেলা নিশ্চিত করুন</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>আপনি কি নিশ্চিত আপনি এই বৈশিষ্ট্য অপসারণ করতে চান?</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[সংরক্ষিত]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation>দেখতে বা সম্পাদনা করতে রিভেল টিপুন</translation>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>আগামীকাল</translation>
     </message>
@@ -1375,10 +1750,6 @@ Do you want to merge your changes?</source>
         <translation><numerusform>%n month(s)</numerusform><numerusform>%n মাস(s)</numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 বছর</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation>জেনারেট করা পাসওয়ার্ড প্রয়োগ করবেন?</translation>
     </message>
@@ -1390,6 +1761,26 @@ Do you want to merge your changes?</source>
         <source>Entry updated successfully.</source>
         <translation>এন্ট্রি সফলভাবে আপডেট করা হয়েছে।</translation>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1635,6 +2026,81 @@ Do you want to merge your changes?</source>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>ফরম</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>পাসওয়ার্ড:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1692,10 +2158,6 @@ Do you want to merge your changes?</source>
         <translation>Favicon আনতে অক্ষম হয়েছে।</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>ইঙ্গিত: আপনি গুগল কে ফল-ব্যাক হিসেবে সক্রিয় করতে পারেন টুলস &gt; সেটিংস &gt; নিরাপত্তা</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>ছবি</translation>
     </message>
@@ -1704,14 +2166,6 @@ Do you want to merge your changes?</source>
         <translation>সকল ফাইল</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>ছবি নির্বাচন করুন</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read icon</source>
-        <translation>আইকন দেখা যায়নি</translation>
-    </message>
-    <message>
         <source>Custom icon already exists</source>
         <translation>স্বনির্বাচিত আইকন ইতোমধ্যে বিদ্যমান</translation>
     </message>
@@ -1720,8 +2174,36 @@ Do you want to merge your changes?</source>
         <translation>মুছে ফেলা নিশ্চিত করুন</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>এই আইকন %1 এন্ট্রি দ্বারা ব্যবহৃত হচ্ছে, এবং ডিফল্ট আইকন দ্বারা প্রতিস্থাপিত হবে। আপনি কি নিশ্চিত যে আপনি এটা মুছে ফেলতে চান?</translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1772,9 +2254,8 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation> -নকল</translation>
+        <source>%1 - Clone</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1819,10 +2300,6 @@ This may cause the affected plugins to malfunction.</source>
         <translation><numerusform>আপনি কি নিশ্চিত যে আপনি %n সংযোজন (গুলো) অপসারণ করতে চান?</numerusform><numerusform>আপনি কি নিশ্চিত যে আপনি %n সংযুক্তি (গুলো) অপসারণ করতে চান?</numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>মূছে ফেলা নিশ্চিত করুন</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>সংযুক্তিসমূহ সংরক্ষণ করুন</translation>
     </message>
@@ -1859,10 +2336,13 @@ This may cause the affected plugins to malfunction.</source>
 %1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>ফাইল খোলা যায়নি: 
-%1</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1946,6 +2426,106 @@ This may cause the affected plugins to malfunction.</source>
         <source>Attachments</source>
         <translation>সংযুক্তিসমূহ</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>TOTP টোকেন তৈরি করুন</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>বন্ধ করুন</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>সাধারন</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>ব্যবহারকরীর নাম</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>পাসওয়ার্ড</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>মেয়াদ শেষে</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>বৈশিষ্ট্যাবলী</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>সংযুক্তিসমূহ</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>নোটসমূহ</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>অটোটাইপ</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>উইন্ডো</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>অনুক্রম</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>সন্ধান করা হচ্ছে</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>সন্ধান</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>পরিস্কার</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>কখনো না</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[সংরক্ষিত]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>সক্রিয়</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>নিষ্ক্রিয়</translation>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EntryView</name>
@@ -1984,6 +2564,19 @@ This may cause the affected plugins to malfunction.</source>
         <source>Recycle Bin</source>
         <translation>রিসাইকেল বিন</translation>
     </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>HostInstaller</name>
@@ -1997,61 +2590,6 @@ This may cause the affected plugins to malfunction.</source>
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>দৈর্ঘ্য:</translation>
-    </message>
-    <message>
-        <source>Character Types</source>
-        <translation>অক্ষরের ধরণ</translation>
-    </message>
-    <message>
-        <source>Upper Case Letters</source>
-        <translation>বড় হাতের অক্ষর</translation>
-    </message>
-    <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
-    </message>
-    <message>
-        <source>Lower Case Letters</source>
-        <translation>ছোট হাতের অক্ষর</translation>
-    </message>
-    <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
-    </message>
-    <message>
-        <source>Numbers</source>
-        <translation>নম্বরগুলি</translation>
-    </message>
-    <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
-    </message>
-    <message>
-        <source>Special Characters</source>
-        <translation>বিশেষ অক্ষরসমূহ</translation>
-    </message>
-    <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
-    </message>
-    <message>
-        <source>Exclude look-alike characters</source>
-        <translation>একই ধরনের অক্ষরসমূহ বাদ দিন</translation>
-    </message>
-    <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>পাসওয়ার্ড টি প্রত্যেক অক্ষর দলের সমন্বয় নিশ্চিত করুন</translation>
-    </message>
-    <message>
-        <source>Extended ASCII</source>
-        <translation>বর্ধিত ASCII</translation>
-    </message>
-</context>
-<context>
     <name>KMessageWidget</name>
     <message>
         <source>&amp;Close</source>
@@ -2076,6 +2614,26 @@ This may cause the affected plugins to malfunction.</source>
         <source>Wrong key or database file is corrupt.</source>
         <translation>ভুল কী বা ডাটাবেস ফাইল নষ্ট হয়েছে।</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation>ডাটাবেসের হেডারসমূহ নেই</translation>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>হেডারের আইডি আকার সঠিক নয়</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>হেডার ক্ষেত্রের দৈর্ঘ্য সঠিক নয়</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>হেডার তথ্য দৈর্ঘ্য সঠিক নয়</translation>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2235,10 +2793,6 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation type="unfinished"/>
     </message>
@@ -2289,6 +2843,18 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Unsupported KeePass 2 database version.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2361,10 +2927,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation type="unfinished"/>
     </message>
@@ -2413,6 +2975,12 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2576,58 +3144,144 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Invalid entry field type</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <source>Disabled share</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <source>Import from</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
+        <source>Export to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
+        <source>Synchronize with</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
+        <source>Key Component</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>বাতিল</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>KeyFileEditWidget</name>
     <message>
-        <source>&amp;Database</source>
+        <source>Browse</source>
+        <translation>ব্রাউজ করুন</translation>
+    </message>
+    <message>
+        <source>Generate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Recent databases</source>
+        <source>Key File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import</source>
+        <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"/>
     </message>
     <message>
-        <source>&amp;Help</source>
+        <source>Legacy key file format</source>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>E&amp;ntries</source>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>কী ফাইলগুলো</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>সকল ফাইল</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>কী ফাইল তৈরি করুন...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>কী ফাইল নির্বাচন করুন</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
+        <source>&amp;Recent databases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Time-based one-time password</source>
+        <source>&amp;Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>E&amp;ntries</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2659,431 +3313,514 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;New database</source>
+        <source>&amp;Delete entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge from KeePassX database</source>
+        <source>&amp;Edit group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Add new entry</source>
+        <source>&amp;Delete group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;View/Edit entry</source>
+        <source>Sa&amp;ve database as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Delete entry</source>
+        <source>Database settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Add new group</source>
+        <source>&amp;Clone entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Edit group</source>
+        <source>Copy &amp;username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Delete group</source>
+        <source>Copy username to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sa&amp;ve database as...</source>
+        <source>Copy password to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
+        <source>&amp;Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Database settings</source>
+        <source>Password Generator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Database settings</source>
+        <source>&amp;Lock databases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Clone entry</source>
+        <source>&amp;Title</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Find</source>
+        <source>Copy title to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy &amp;username</source>
+        <source>&amp;URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy username to clipboard</source>
+        <source>Copy URL to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
+        <source>&amp;Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy password to clipboard</source>
+        <source>Copy notes to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Settings</source>
+        <source>&amp;Export to CSV file...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password Generator</source>
+        <source>Set up TOTP...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
+        <source>Copy &amp;TOTP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Open URL</source>
+        <source>E&amp;mpty recycle bin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Lock databases</source>
+        <source>Clear history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Title</source>
+        <source>Access error for config file %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy title to clipboard</source>
+        <source>Settings</source>
+        <translation>সেটিংস</translation>
+    </message>
+    <message>
+        <source>Toggle window</source>
+        <translation>উইন্ডো পরিবর্তন</translation>
+    </message>
+    <message>
+        <source>Quit KeePassXC</source>
+        <translation>KeePassXC বন্ধ করুন</translation>
+    </message>
+    <message>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>দয়া করে আপনার YubiKey! বাটন স্পর্শ করুন</translation>
+    </message>
+    <message>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation>সতর্কীকরণ: আপনি একটি আনস্টেবল ভার্সনের KeePassXC ব্যবহার করছেন।
+সমস্যা হবার উচ্চ ঝুঁকি আছে, আপনার ডাটাবেস ব্যাকআপ রাখুন।
+-এই সংস্করণ নিয়মিত ব্যবহারের জন্য বানানো হয়নি।</translation>
+    </message>
+    <message>
+        <source>&amp;Donate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;URL</source>
+        <source>Report a &amp;bug</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy URL to clipboard</source>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Notes</source>
+        <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy notes to clipboard</source>
+        <source>Copy att&amp;ribute...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Export to CSV file...</source>
+        <source>TOTP...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
+        <source>&amp;New database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import CSV file...</source>
+        <source>Create a new database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;pair database...</source>
+        <source>&amp;Merge from database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show TOTP</source>
+        <source>Merge from another KDBX database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Set up TOTP...</source>
+        <source>&amp;New entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
+        <source>Add a new entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>E&amp;mpty recycle bin</source>
+        <source>&amp;Edit entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear history</source>
+        <source>View or edit entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
+        <source>&amp;New group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
+        <source>Add a new group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>read-only</source>
-        <translation>শুধুমাত্র পাঠযোগ্য</translation>
+        <source>Change master &amp;key...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>সেটিংস</translation>
+        <source>&amp;Database settings...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Toggle window</source>
-        <translation>উইন্ডো পরিবর্তন</translation>
+        <source>Copy &amp;password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Quit KeePassXC</source>
-        <translation>KeePassXC বন্ধ করুন</translation>
+        <source>Perform &amp;Auto-Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 ডাটাবেস</translation>
+        <source>Open &amp;URL</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>সকল ফাইল</translation>
+        <source>KeePass 1 database...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>উন্মুক্ত ডাটাবেস</translation>
+        <source>Import a KeePass 1 database</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>মেরামতকৃত ডাটাবেস সংরক্ষন করুন</translation>
+        <source>CSV file...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>এই ডাটাবেসে লেখা ব্যর্থ হয়েছে।</translation>
+        <source>Import a CSV file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>দয়া করে আপনার YubiKey! বাটন স্পর্শ করুন</translation>
+        <source>Show TOTP...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
-        <translation>সতর্কীকরণ: আপনি একটি আনস্টেবল ভার্সনের KeePassXC ব্যবহার করছেন।
-সমস্যা হবার উচ্চ ঝুঁকি আছে, আপনার ডাটাবেস ব্যাকআপ রাখুন।
--এই সংস্করণ নিয়মিত ব্যবহারের জন্য বানানো হয়নি।</translation>
+        <source>Show TOTP QR Code...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>OpenSSHKey</name>
+    <name>Merger</name>
     <message>
-        <source>Invalid key file, expecting an OpenSSH key</source>
+        <source>Creating missing %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>PEM boundary mismatch</source>
+        <source>Relocating %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Base64 decoding failed</source>
+        <source>Overwriting %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key file way too small.</source>
-        <translation>কী ফাইল খুবই ছোট</translation>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key file magic header id invalid</source>
+        <source>Adding backup for older target %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Found zero keys</source>
-        <translation>কোন কী খুজে পাওয়া যায়নি</translation>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to read public key.</source>
-        <translation>পাবলিক কী পড়তে ব্যর্থ হয়েছে।</translation>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Corrupted key file, reading private key failed</source>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>No private key payload to decrypt</source>
+        <source>Synchronizing from newer source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Trying to run KDF without cipher</source>
+        <source>Synchronizing from older source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase is required to decrypt this key</source>
+        <source>Deleting child %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key derivation failed, key file corrupted?</source>
+        <source>Deleting orphan %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Decryption failed, wrong passphrase?</source>
+        <source>Changed deleted objects</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unexpected EOF while reading public key</source>
+        <source>Adding missing icon %1</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
     <message>
-        <source>Unexpected EOF while reading private key</source>
+        <source>Create a new KeePassXC database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t write public key as it is empty</source>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>রুট</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unexpected EOF when writing public key</source>
+        <source>En&amp;cryption Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t write private key as it is empty</source>
+        <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"/>
     </message>
     <message>
-        <source>Unexpected EOF when writing private key</source>
+        <source>Advanced Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported key type: %1</source>
+        <source>Simple Settings</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
     <message>
-        <source>Unknown cipher: %1</source>
+        <source>Encryption Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cipher IV is too short for MD5 kdf</source>
+        <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"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
     <message>
-        <source>Unknown KDF: %1</source>
+        <source>Database Master Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unknown key type: %1</source>
+        <source>A master key known only to you protects your database.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>NewDatabaseWizardPageMetaData</name>
     <message>
-        <source>Dialog</source>
-        <translation>সংলাপ</translation>
+        <source>General Database Information</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
+        <source>Please fill in the display name and an optional description for your new database:</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Enable KeePassHTTP server</source>
+        <source>Invalid key file, expecting an OpenSSH key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>সাধারন</translation>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <source>Base64 decoding failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>একটি নির্দিষ্ট URL জন্য সম্ভাব্য সর্ব্বোত্তম ফলাফলটি দেখাবে পুরো ডোমেইনের জন্য সকল এন্ট্রি না দেখিয়ে।</translation>
+        <source>Key file way too small.</source>
+        <translation>কী ফাইল খুবই ছোট</translation>
     </message>
     <message>
-        <source>&amp;Return only best matching entries</source>
+        <source>Key file magic header id invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>ডাটাবেস লক থাকলে আনলক করার অনুরোধ জানান</translation>
+        <source>Found zero keys</source>
+        <translation>কোন কী খুজে পাওয়া যায়নি</translation>
     </message>
     <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
+        <source>Failed to read public key.</source>
+        <translation>পাবলিক কী পড়তে ব্যর্থ হয়েছে।</translation>
+    </message>
+    <message>
+        <source>Corrupted key file, reading private key failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Match URL schemes</source>
+        <source>No private key payload to decrypt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
+        <source>Trying to run KDF without cipher</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
+        <source>Passphrase is required to decrypt this key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
+        <source>Key derivation failed, key file corrupted?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <source>Decryption failed, wrong passphrase?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password Generator</source>
+        <source>Unexpected EOF while reading public key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>উন্নততর</translation>
+        <source>Unexpected EOF while reading private key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
+        <source>Can&apos;t write public key as it is empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
+        <source>Unexpected EOF when writing public key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>শুধুমাত্র নির্বাচিত ডাটাবেসকে ক্লায়েন্টের সাথে সংযুক্ত করা উচিত।</translation>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <source>Unexpected EOF when writing private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>স্বয়ংক্রিয়ভাবে তৈরি করা বা স্ট্রিং ফিল্ড আপডেট করা সমর্থন করে না।</translation>
+        <source>Unsupported key type: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>&quot;KPH: &quot; দিয়ে শুরু হয়েছে এমন উন্নত স্ট্রিং ফিল্ডগুলি দেখান</translation>
+        <source>Unknown cipher: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
+        <source>Cipher IV is too short for MD5 kdf</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
+        <source>Unknown KDF: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <source>Unknown key type: %1</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;সতর্কতা:&lt;/b&gt; নিম্নোক্ত বিকল্পগুলি বিপজ্জনক হতে পারে।</translation>
+        <source>Enter password:</source>
+        <translation>পাসওয়ার্ড প্রবেশ করান:</translation>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <source>Confirm password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
+        <source>Password</source>
+        <translation>পাসওয়ার্ড</translation>
+    </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"/>
+    </message>
+    <message>
+        <source>Password cannot be empty.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passwords do not match.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
+        <source>Generate master password</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -3155,18 +3892,10 @@ Using default port 19455.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Generate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>কপি</translation>
     </message>
@@ -3179,10 +3908,6 @@ Using default port 19455.</source>
         <translation>বন্ধ করুন</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>প্রয়োগ করুন</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation type="unfinished"/>
     </message>
@@ -3210,51 +3935,200 @@ Using default port 19455.</source>
         <comment>Password quality</comment>
         <translation>খুব ভাল</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>উন্নততর</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>QObject</name>
+    <name>QApplication</name>
     <message>
-        <source>Database not opened</source>
+        <source>KeeShare</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>QFileDialog</name>
     <message>
-        <source>Database hash not available</source>
+        <source>Select</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>QMessageBox</name>
     <message>
-        <source>Client public key not received</source>
+        <source>Overwrite</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot decrypt message</source>
+        <source>Delete</source>
+        <translation>মুছে ফেলুন</translation>
+    </message>
+    <message>
+        <source>Move</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
+        <source>Empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Action cancelled or denied</source>
+        <source>Remove</source>
+        <translation>অপসারণ করুন</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>নিষ্ক্রিয়</translation>
+    </message>
+    <message>
+        <source>Merge</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <source>Database not opened</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC association failed, try again</source>
+        <source>Database hash not available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key change was not successful</source>
+        <source>Client public key not received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Encryption key is not recognized</source>
+        <source>Cannot decrypt message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>No saved databases found</source>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -3383,10 +4257,6 @@ Using default port 19455.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3465,137 +4335,510 @@ Available commands:
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>file empty !
-</source>
+        <source>malformed string</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>malformed string</source>
+        <source>missing closing quote</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>missing closing quote</source>
+        <source>Group</source>
+        <translation>দল</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>শিরোনাম</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>ব্যবহারকরীর নাম</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>পাসওয়ার্ড</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>নোটসমূহ</translation>
+    </message>
+    <message>
+        <source>Last Modified</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>AES: 256-bit</source>
+        <source>Created</source>
+        <translation>সৃষ্টি করেছেন</translation>
+    </message>
+    <message>
+        <source>Browser Integration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Twofish: 256-bit</source>
+        <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>ChaCha20: 256-bit</source>
+        <source>Press</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
+        <source>Passive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>AES-KDF (KDBX 4)</source>
+        <source>SSH Agent</source>
+        <translation>SSH এজেন্ট</translation>
+    </message>
+    <message>
+        <source>Generate a new random diceware passphrase.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>AES-KDF (KDBX 3.1)</source>
+        <source>Word count for the diceware passphrase.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Group</source>
-        <translation>দল</translation>
+        <source>Wordlist for the diceware generator.
+[Default: EFF English]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Title</source>
-        <translation>শিরোনাম</translation>
+        <source>Generate a new random password.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Username</source>
-        <translation>ব্যবহারকরীর নাম</translation>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password</source>
-        <translation>পাসওয়ার্ড</translation>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>নোটসমূহ</translation>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Last Modified</source>
+        <source>Writing the database failed %1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Created</source>
-        <translation>সৃষ্টি করেছেন</translation>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
+        <source>Copy the current TOTP to the clipboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Browser Integration</source>
+        <source>Invalid timeout value %1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
+        <source>Entry %1 not found.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Press</source>
+        <source>Entry with path %1 has no TOTP set up.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passive</source>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>SSH Agent</source>
-        <translation>SSH এজেন্ট</translation>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Generate a new random diceware passphrase.</source>
+        <source>Clipboard cleared!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word count for the diceware passphrase.</source>
+        <source>Silence password prompt and other secondary outputs.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <source>count</source>
+        <comment>CLI parameter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist for the diceware generator.
-[Default: EFF English]</source>
+        <source>Invalid value for password length: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Generate a new random password.</source>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Length of the generated password.</source>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
+        <source>Creating KeyFile %1 failed: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>ডাটাবেস থেকে একটি এন্ট্রি মুছে ফেলুন</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>যে এন্ট্রি মুছে ফেলতে চান তার পাথ</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - ক্রস প্ল্যাটফর্ম পাসওয়ার্ড ম্যানেজার</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>পাসওয়ার্ড দিয়ে যে ডাটাবেস (*.kdbx) খুলতে চান তার ফাইলনেম</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>একটি কাস্টম কনফিগ ফাইল পাথ</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>ডাটাবেসের কী ফাইল</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>stdin থেকে ডাটাবেসের পাসওয়ার্ড পড়</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation>মূল উইন্ডো হ্যান্ডেল</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
+        <source>Fatal error while testing the cryptographic functions.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
+        <source>KeePassXC - Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
+        <source>Database password: </source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -3634,12 +4877,98 @@ Available commands:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
+    <message>
+        <source>Agent connection failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <source>Search...</source>
+        <source>logical OR</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Examples</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
         <source>Search</source>
         <translation>সন্ধান</translation>
     </message>
@@ -3648,311 +4977,316 @@ Available commands:
         <translation>পরিস্কার</translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
+        <source>Limit search to selected group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Limit search to selected group</source>
+        <source>Search Help</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Service</name>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC: নতুন কী (key) যুক্ত করার আবেদন</translation>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
+        <source>Case sensitive</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: বর্তমান কী উপরিলিখন করবেন?</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
+        <source>Allow export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: হালনাগাদ এন্ট্রি</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>%1 - %2 এর মধ্যে তথ্য হালনাগাদ করতে চান?</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: ডাটাবেস তালাবদ্ধ !</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>সক্রিয় ডাটাবেজ বন্ধ রয়েছে।
-নির্বাচিত ডাটাবেস আনলক করুন বা খোলা আছে এমন অন্য একটি পছন্দ করুন।</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: কী ডাটাবেস থেকে অপসারণ করা হয়েছে</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: কোন কী পাওয়া যায়নি</translation>
+        <source>Key:</source>
+        <translation>কী:</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <source>Generate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: সেটিংস সমূহ সুপ্রাপ্য নয়।</translation>
+        <source>Import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <source>Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
+        <source>Imported certificates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>বাতিল</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: অনুমতিসমূহ অপসারণ করা হয়েছে</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    <message>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: অনুমতিসহ কোন এন্ট্রি পাওয়া যায়নি।</translation>
+        <source>Remove</source>
+        <translation>অপসারণ করুন</translation>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>সক্রিয় ডাটাবেজ প্রবেশের অনুমতিসহ কোর এন্ট্রি নেই।</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
+        <source>Status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>সাধারন</translation>
+        <source>Fingerprint</source>
+        <translation>আঙ্গুলের ছাপ</translation>
     </message>
     <message>
-        <source>Security</source>
+        <source>Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
+        <source>Trusted</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
+        <source>Untrusted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
+        <source>Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
+        <source>KeeShare key file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
+        <source>All files</source>
+        <translation>সকল ফাইল</translation>
+    </message>
+    <message>
+        <source>Select path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
+        <source>Exporting changed certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
+        <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"/>
     </message>
     <message>
-        <source>Automatically reload the database when modified externally</source>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Minimize when copying to clipboard</source>
+        <source>Import from container without signature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
+        <source>Import from container with certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
+        <source>Not this time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show a system tray icon</source>
+        <source>Never</source>
+        <translation>কখনো না</translation>
+    </message>
+    <message>
+        <source>Always</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
+        <source>Just this time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
+        <source>Import from %1 failed (%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
+        <source>Import from %1 successful (%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
+        <source>Imported from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>অটো-টাইপ</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
+        <source>File is not readable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
+        <source>Invalid sharing container</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
+        <source>Untrusted import prevented</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
+        <source>Successful signed import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
+        <source>Unexpected error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation>এমএস</translation>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
-        <translation>সূচনা</translation>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
-        <translation>ফাইল ব্যবস্থাপনা</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation>নিরাপদে ডাটাবেস সংরক্ষণ করুন (ড্রডবক্স, এবং অন্যান্যর সাথে অসংগত হতে পারে)</translation>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
-        <translation>সংরক্ষণ করার আগে ডাটাবেস ব্যাকআপ করুন</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
-        <translation>এন্ট্রি ব্যবস্থাপনা</translation>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>সাধারন</translation>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
-        <translation>সময় শেষ</translation>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>ক্লিপবোর্ড পরিস্কার হবে</translation>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>সে.</translation>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>অব্যবহৃত থাকলে ডাটাবেস লক হবে</translation>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>সাচ্ছন্দ্য</translation>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>ডাটাবেস লক হবে লিড বন্ধ করলে বা সেশন লক করলে</translation>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>উইন্ডো মিনিমাইজ করলে ডাটাবেস লক হবে</translation>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>TotpDialog</name>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>আবার যখন দৃশ্যমান হবে তখন পাসওয়ার্ড লাগবেনা</translation>
+        <source>Timed Password</source>
+        <translation>সময়ানুসারে পাসওয়ার্ড</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>ডিফল্টভাবে পাসওয়ার্ড সাধারন লেখায় দেখান</translation>
+        <source>000000</source>
+        <translation>000000</translation>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
-        <translation>প্রদর্শন প্যানেলে পাসওয়ার্ড লুকান</translation>
+        <source>Copy</source>
+        <translation>কপি</translation>
     </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
     <message>
-        <source>Hide entry notes by default</source>
-        <translation>ডিফল্টভাবে এন্ট্রি নোট লুকান</translation>
+        <source>Copy</source>
+        <translation>কপি</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>গোপণীয়তা</translation>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>গুগল ব্যবহার করুন ওয়েবসাইটের আইকন ডাউনলোড করার জন্য</translation>
+        <source>There was an error creating the QR code.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
-        <translation>অটো-টাইপের পরে পূনরায় লক করুন আগের লক করা ডাটাবেস</translation>
+        <source>Closing in %1 seconds.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation>TOTP সেট করুন</translation>
@@ -3974,59 +5308,84 @@ Please unlock the selected database or choose another one which is unlocked.</so
         <translation>সচারচর সেটিংসমূহ ব্যবহার করুন</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>দ্রষ্টব্য: এই সেটিংস পরিবর্তন করুন শুধুমাত্র যদি আপনি জানেন যে আপনি কি করছেন।</translation>
+        <source>Custom Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Time step:</source>
         <translation>সময় ধাপ:</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>৮ ডিজিট</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>সে.</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>কোড সাইজ:</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>৬ ডিজিট</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>কোড সাইজ:</translation>
+        <source>7 digits</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>সে.</translation>
+        <source>8 digits</source>
+        <translation>৮ ডিজিট</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>সময়ানুসারে পাসওয়ার্ড</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>কপি</translation>
+        <source>Close</source>
+        <translation>বন্ধ করুন</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>মেয়াদ শেষ</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>সেকেন্ড</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>ডাটাবেস আনলক করুন</translation>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4061,42 +5420,26 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
 </context>
 <context>
-    <name>main</name>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>Remove an entry from the database.</source>
-        <translation>ডাটাবেস থেকে একটি এন্ট্রি মুছে ফেলুন</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>ডাটাবেসের পাথ</translation>
-    </message>
-    <message>
-        <source>Path of the entry to remove.</source>
-        <translation>যে এন্ট্রি মুছে ফেলতে চান তার পাথ</translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - ক্রস প্ল্যাটফর্ম পাসওয়ার্ড ম্যানেজার</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>পাসওয়ার্ড দিয়ে যে ডাটাবেস (*.kdbx) খুলতে চান তার ফাইলনেম</translation>
+        <source>Refresh</source>
+        <translation>রিফ্রেশ</translation>
     </message>
     <message>
-        <source>path to a custom config file</source>
-        <translation>একটি কাস্টম কনফিগ ফাইল পাথ</translation>
+        <source>YubiKey Challenge-Response</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>ডাটাবেসের কী ফাইল</translation>
+        <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"/>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>stdin থেকে ডাটাবেসের পাসওয়ার্ড পড়</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Parent window handle</source>
-        <translation>মূল উইন্ডো হ্যান্ডেল</translation>
+        <source>No YubiKey inserted.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_ca.ts b/share/translations/keepassx_ca.ts
index b5b1a45fe..4702696c6 100644
--- a/share/translations/keepassx_ca.ts
+++ b/share/translations/keepassx_ca.ts
@@ -38,12 +38,6 @@
         <translation>Copia al porta-retalls</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>Versió %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>Revisió: %1</translation>
     </message>
@@ -76,35 +70,48 @@ Nucli: %3 %4</translation>
         <translation>Agraïments de l&apos;equip de KeePassXC a debfx per crear el KeePassX original.</translation>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
-        <translation>Tipus de construcció: %1
-</translation>
+        <source>Version %1</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP Confirmeu l&apos;accés</translation>
+        <source>Build Type: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>Recorda aquesta decisió</translation>
+        <source>Auto-Type</source>
+        <translation>Compleció automàtica</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Permet</translation>
+        <source>Browser Integration</source>
+        <translation>Integració amb el navegador</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>Denega</translation>
+        <source>SSH Agent</source>
+        <translation>Agent SSH</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>%1 ha demanat l&apos;accés a contrasenyes pels següents elements.
-Seleccioneu si voleu permetre l&apos;accés.</translation>
+        <source>YubiKey</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -113,6 +120,277 @@ Seleccioneu si voleu permetre l&apos;accés.</translation>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>Habilita l&apos;agent SSH (requereix reiniciar-se)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Configuració de l&apos;aplicació</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Seguretat</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Error d&apos;accés al fitxer de configuració %1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Configuració bàsica</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Obriu només una sola instància del KeePassXC</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Recordeu les últimes bases de dades</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Recordeu els últims arxius clau i motxilles de seguretat</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Carregueu les bases de dades anteriors a l&apos;obrir el KeepassXC</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>Minimitzeu la finestra a l&apos;obrir l&apos;aplicació</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Deseu després de cada canvi de forma automàtica</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Deseu en tancar de forma automàtica</translation>
+    </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>
+    </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>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>Utilitzeu la icona del grup al crear una entrada</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Minimitzeu en copiar al porta-retalls</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Mostreu una icona a la safata del sistema</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Amagueu la finestra a la safata del sistema quan es minimitze</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Idioma</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Compleció automàtica</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>Pregunteu sempre abans d&apos;efectuar la compleció automàtica</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Drecera global de compleció automàtica</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation> ms</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>Temps excedits</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>Neteja el porta-retalls després</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> sec</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>Bloquegeu les bases de dades després d&apos;estar inactives per</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>Conveniència</translation>
+    </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>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>Bloquegeu les bases de dades després minimitzar la finestra</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>No requerir la repetició de la contrasenya quan aquesta és visible</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>Privacitat</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -216,6 +494,26 @@ Seleccioneu si voleu permetre l&apos;accés.</translation>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancel·lar</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -289,14 +587,6 @@ Seleccioneu si voleu permetre l&apos;accés.</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>&amp;Desconnecta tots els navegadors</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>Oblida tots els &amp;permisos recordats</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>Avançat</translation>
     </message>
@@ -362,19 +652,36 @@ Seleccioneu si voleu permetre l&apos;accés.</translation>
         <translation>&lt;b&gt;Atenció:&lt;/b&gt; Canviar les següents opcions és perillós!</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>Arxius executables (*.exe);;Tots els arxius (*.*)</translation>
+        <source>Select custom proxy location</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Executable Files (*)</source>
-        <translation>Arxius executables (*)</translation>
+        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Select custom proxy location</source>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
+        <source>&amp;Tor Browser</source>
+        <translation type="unfinished"/>
+    </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: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not ask permission for HTTP &amp;Basic Auth</source>
+        <extracomment>An extra HTTP Basic Auth setting</extracomment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -414,149 +721,43 @@ Voleu sobreescriure-la?</translation>
         <translation>Voleu actualitzar la informació en %1 - %2?</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Base de dades bloquejada!</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>La base de dades activa està bloquejada!
-Per favor, desbloqueu  la base de dades seleccionada o escolliu-ne una altra.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: La configuració no està disponible!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation>La base de dades activa no conté cap entrada de configuració.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: No s&apos;han trobat claus</translation>
+        <source>Abort</source>
+        <translation>Avorta</translation>
     </message>
     <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <source>Converting attributes to custom data…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Claus de la base de dades eliminades</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>Eliminant permisos emmagatzemats...</translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation>Avorta</translation>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Permisos eliminats</translation>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
+        <source>Successfully moved %n keys to custom data.</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: No s&apos;ha trobat cap entrada amb permisos!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>La base de dades activa no conté cap entrada amb permisos.</translation>
-    </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>Contrasenya</translation>
-    </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>Introduïu la contrasenya:</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>Repetiu la contrasenya:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>Arxiu clau</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>Navega</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Crea</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>Pregunta/resposta</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Actualitza</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>Fitxers de clau</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>Tots els fitxers</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>Crea un arxiu clau...</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>No s&apos;ha pogut de crear el fitxer clau: </translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>Seleccioneu un arxiu clau</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Contrasenya buida</translation>
-    </message>
-    <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>Realment voleu utilitzar una cadena buida com a contrasenya?</translation>
-    </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>Les contrasenyes no coincideixen.</translation>
-    </message>
-    <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>No ha pogut definir %1 com a arxiu clau: %2</translation>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Legacy key file format</source>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
         <translation type="unfinished"/>
     </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>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>Ha fallat el canvi de clau mestra: cap YubiKey inserida.</translation>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -637,14 +838,6 @@ Please consider generating a new key file.</source>
         <translation>No apareix al fitxer CSV</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>Camp de nom buit</translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>columna </translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>Importats d&apos;un fitxer CSV</translation>
     </message>
@@ -653,51 +846,87 @@ Please consider generating a new key file.</source>
         <translation>Dades originals: </translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>S&apos;ha(n) detectat error(s) al fitxer CSV !</translation>
+        <source>Error</source>
+        <translation>Error</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation> més missatges omesos]</translation>
+        <source>Empty fieldname %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Error</translation>
+        <source>column %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>Importació CSV: el fitxer té errors:
-</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>Error</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>No es pot calcular la clau mestra</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
+        <source>%n column(s)</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
+        <source>%n byte(s)</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
+        <source>%n row(s)</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Arrel</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DatabaseOpenWidget</name>
     <message>
         <source>Enter master key</source>
@@ -724,14 +953,6 @@ Please consider generating a new key file.</source>
         <translation>Pregunta/resposta</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>No es pot obrir la base de dades.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>No es pot obrir el fitxer de clau</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation type="unfinished"/>
     </message>
@@ -758,102 +979,169 @@ Please consider generating a new key file.</source>
         <source>Select key file</source>
         <translation>Seleccioneu el fitxer de clau</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>Repara la base de dades</translation>
+        <source>TouchID for quick unlock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Error</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>No es pot obrir el fitxer de clau</translation>
+        <source>Can't open key file:
+%1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>No es pot obrir la base de dades.</translation>
+        <source>Passwords</source>
+        <translation>Contrasenyes</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Base de dades oberta correctament.</translation>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Success</source>
-        <translation>Completat amb èxit</translation>
+        <source>General</source>
+        <translation>General</translation>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>La base de dades ha estat reparada.
- Ara es pot desar.</translation>
+        <source>Security</source>
+        <translation>Seguretat</translation>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>No es pot reparar la base de dades.</translation>
+        <source>Master Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation>Integració amb el navegador</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>General</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>Encriptatge</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>&amp;Desconnecta tots els navegadors</translation>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
+        <source>Forg&amp;et all site-specific settings on entries</source>
         <translation type="unfinished"/>
     </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>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Understood, keep number</source>
+        <source>Stored keys</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>Cancel·lar</translation>
+        <source>Remove</source>
+        <translation>Suprimiu</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
+        <source>Delete the selected key?</source>
         <translation type="unfinished"/>
     </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>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KDF unchanged</source>
+        <source>Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: No s&apos;han trobat claus</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Claus de la base de dades eliminades</translation>
+    </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Eliminant permisos emmagatzemats...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Avorta</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Permisos eliminats</translation>
+    </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
+        <source>Successfully removed permissions from %n entry(s).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: No s&apos;ha trobat cap entrada amb permisos!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>La base de dades activa no conté cap entrada amb permisos.</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetEncryption</name>
@@ -889,6 +1177,109 @@ If you keep this number, your database may be too easy to crack!</source>
         <source>Parallelism:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancel·lar</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -938,91 +1329,110 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>Arrel</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Base de dades de KeePass 2</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Tots els fitxers</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Obre la base de dades</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>No s&apos;ha trobat el fitxer!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>No es pot obrir la base de dades.</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>Arxiu obert en mode de només lectura.</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>Obre arxiu CSV</translation>
+        <source>Add additional protection...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>Fitxer CSV</translation>
+        <source>No encryption key added</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>Tots els arxius (*)</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Fusiona la base de dades</translation>
+        <source>No password set</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Obre base de dades de KeePass 1</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 type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>Base de dades de KeePass 1</translation>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>Voleu tancar?</translation>
+        <source>Failed to change master key</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; està en mode d&apos;edició.
-Voleu descartar els canvis i tancar de totes maneres?</translation>
+        <source>Database Name:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>Voleu desar els canvis?</translation>
+        <source>Description:</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>&quot;%1&quot; ha canviat.
-Voleu desar els canvis?</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Base de dades de KeePass 2</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Ha fallat l&apos;escriptura en la base de dades.</translation>
+        <source>All files</source>
+        <translation>Tots els fitxers</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Contrasenyes</translation>
+        <source>Open database</source>
+        <translation>Obre la base de dades</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Desa la base de dades com a</translation>
+        <source>CSV file</source>
+        <translation>Fitxer CSV</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>Fusiona la base de dades</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Obre base de dades de KeePass 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>Base de dades de KeePass 1</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1033,38 +1443,39 @@ Voleu desar els canvis?</translation>
         <translation>Ha fallat l&apos;escriptura al fitxer CSV.</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>Nova base de dades</translation>
+        <source>Database creation error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>locked</source>
-        <translation>bloquejat</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 type="unfinished"/>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>Bloqueja la base de dades</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>No es pot bloquejar la base de dades actualment en ús.
-Per favor,  feu clic a cancel·la per a finalitzar els canvis o descarteu-los.</translation>
+        <source>Select CSV file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>Aquesta base de dades ha estat modificada.
-Voleu desar la base de dades abans de tancar-la?
-En cas contrari, es perderan els canvis.</translation>
+        <source>New Database</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disable safe saves?</source>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
         <translation type="unfinished"/>
     </message>
     <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>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1075,37 +1486,13 @@ Disable safe saves and try again?</source>
         <translation>Cercant...</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>Canvia la clau mestra</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>Suprimir l&apos;entrada?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>Realment voleu suprimir l&apos;entrada &quot;%1&quot; per sempre?</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Suprimir les entrades?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Realment voleu suprimir %1 entrades per sempre?</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Moure l&apos;entrada a la Paperera?</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation>Realment voleu moure l&apos;entrada &quot;%1&quot; a la paperera?</translation>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Moure les entrades a la paperera?</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
@@ -1123,18 +1510,10 @@ Disable safe saves and try again?</source>
         <translation>Recordar la meva elecció</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Voleu suprimir el grup?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>Realment voleu suprimir el grup &quot;%1&quot; per sempre?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>No es pot calcular la clau mestra</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>Cap base de dades actual.</translation>
     </message>
@@ -1168,10 +1547,6 @@ Do you want to merge your changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>No s&apos;ha pogut obrir el nou fitxer de base de dades al intentar reobrir aquesta base de dades.</translation>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>Buida la paperera?</translation>
     </message>
@@ -1179,88 +1554,103 @@ Do you want to merge your changes?</source>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>Esteu segur que voleu suprimir permanentment tot el contingut de la paperera?</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation type="unfinished"/>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Tanca</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Arxiu obert en mode de només lectura.</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>General</translation>
+        <source>Lock Database?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Contrasenya</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot; ha canviat.
+Voleu desar els canvis?</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>Venciment</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Nom d&apos;usuari</translation>
+        <source>Save changes?</source>
+        <translation>Voleu desar els canvis?</translation>
     </message>
     <message>
-        <source>Autotype</source>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>S&apos;està cercant</translation>
+        <source>Disable safe saves?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>Atributs</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Fitxers adjunts</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Notes</translation>
+        <source>Passwords</source>
+        <translation>Contrasenyes</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>Finestra</translation>
+        <source>Save database as</source>
+        <translation>Desa la base de dades com a</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>Seqüència</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Base de dades de KeePass 2</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Cerca</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Neteja</translation>
+        <source>Delete group</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Never</source>
-        <translation>Mai</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>Inhabilitat</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Habilitat</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1334,22 +1724,10 @@ Do you want to merge your changes?</source>
         <translation>Nou atribut</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Confirma la supressió</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>Esteu segur que voleu suprimir aquest atribut?</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>Demà</translation>
     </message>
@@ -1362,10 +1740,6 @@ Do you want to merge your changes?</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 any</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation type="unfinished"/>
     </message>
@@ -1377,6 +1751,26 @@ Do you want to merge your changes?</source>
         <source>Entry updated successfully.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation>[PROTEGIT] Premeu revelar per veure o editar</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1622,6 +2016,81 @@ Do you want to merge your changes?</source>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Contrasenya:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1679,10 +2148,6 @@ Do you want to merge your changes?</source>
         <translation>No es pot descarregar el favicon.</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Consell: Podeu activar Google com a recurs alternatiu a Eines &gt; Configuració &gt; Seguretat</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>Imatges</translation>
     </message>
@@ -1691,14 +2156,6 @@ Do you want to merge your changes?</source>
         <translation>Tots els fitxers</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Seleccioneu la imatge</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read icon</source>
-        <translation>No es pot llegir la icona</translation>
-    </message>
-    <message>
         <source>Custom icon already exists</source>
         <translation>Ja existeix una icona personalitzada</translation>
     </message>
@@ -1707,8 +2164,36 @@ Do you want to merge your changes?</source>
         <translation>Confirma la supressió</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>Aquesta icona s&apos;utilitza en %1 entrades i serà substituïda per la icona per defecte. Esteu segur que voleu suprimir-la?</translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1758,9 +2243,8 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation> -Clon</translation>
+        <source>%1 - Clone</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1805,10 +2289,6 @@ This may cause the affected plugins to malfunction.</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Confirma la supressió</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation type="unfinished"/>
     </message>
@@ -1841,10 +2321,14 @@ This may cause the affected plugins to malfunction.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open files:
-%1</source>
+        <source>Confirm remove</source>
         <translation type="unfinished"/>
     </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
+%1</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
 </context>
 <context>
     <name>EntryAttributesModel</name>
@@ -1927,109 +2411,167 @@ This may cause the affected plugins to malfunction.</source>
         <source>Attachments</source>
         <translation>Fitxers adjunts</translation>
     </message>
-</context>
-<context>
-    <name>EntryView</name>
     <message>
-        <source>Customize View</source>
+        <source>Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide Usernames</source>
+        <source>TOTP</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
     <message>
-        <source>Hide Passwords</source>
+        <source>Generate TOTP Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fit to window</source>
-        <translation type="unfinished"/>
+        <source>Close</source>
+        <translation>Tanca</translation>
     </message>
     <message>
-        <source>Fit to contents</source>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Nom d&apos;usuari</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Contrasenya</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Venciment</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>Atributs</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Fitxers adjunts</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notes</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Reset to defaults</source>
+        <source>Window</source>
+        <translation>Finestra</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Seqüència</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>S&apos;està cercant</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Cerca</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Neteja</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Mai</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Attachments (icon)</source>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Group</name>
     <message>
-        <source>Recycle Bin</source>
-        <translation>Paperera</translation>
+        <source>Enabled</source>
+        <translation>Habilitat</translation>
     </message>
-</context>
-<context>
-    <name>HostInstaller</name>
     <message>
-        <source>KeePassXC: Cannot save file!</source>
-        <translation type="unfinished"/>
+        <source>Disabled</source>
+        <translation>Inhabilitat</translation>
     </message>
     <message>
-        <source>Cannot save the native messaging script file.</source>
+        <source>Share</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>Longitud:</translation>
-    </message>
+    <name>EntryView</name>
     <message>
-        <source>Character Types</source>
-        <translation>Tipus de caràcter</translation>
+        <source>Customize View</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Upper Case Letters</source>
-        <translation>Lletra majúscula</translation>
+        <source>Hide Usernames</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
+        <source>Hide Passwords</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lower Case Letters</source>
-        <translation>Lletra minúscula</translation>
+        <source>Fit to window</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
+        <source>Fit to contents</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Numbers</source>
-        <translation>Números</translation>
+        <source>Reset to defaults</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
+        <source>Attachments (icon)</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Group</name>
     <message>
-        <source>Special Characters</source>
-        <translation>Caràcters especials</translation>
+        <source>Recycle Bin</source>
+        <translation>Paperera</translation>
     </message>
     <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>GroupModel</name>
     <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Excloure caràcters d&apos;aspecte semblant</translation>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>HostInstaller</name>
     <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>Assegurar-se que la contrasenya conté caràcters de cada grup</translation>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extended ASCII</source>
-        <translation>ASCII estès</translation>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2057,6 +2599,26 @@ This may cause the affected plugins to malfunction.</source>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Clau incorrecta o fitxer de base de dades corrupte.</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2216,10 +2778,6 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation type="unfinished"/>
     </message>
@@ -2273,6 +2831,18 @@ Es tracta d&apos;una migració unidireccional. No obrir la base de dades importa
         <source>Unsupported KeePass 2 database version.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2345,10 +2915,6 @@ Es tracta d&apos;una migració unidireccional. No obrir la base de dades importa
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation type="unfinished"/>
     </message>
@@ -2397,6 +2963,12 @@ Es tracta d&apos;una migració unidireccional. No obrir la base de dades importa
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2560,28 +3132,126 @@ Es tracta d&apos;una migració unidireccional. No obrir la base de dades importa
         <source>Invalid entry field type</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>El fitxer de bloqueig d&apos;instància única no és vàlid. Execute una instància nova.</translation>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>No s&apos;ha pogut crear l&apos;arxiu de bloqueig. Inhabilitat el mode de instància única.</translation>
+        <source>Import from</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Ja s&apos;està executant una altra instància de KeePassXC.</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Error mentre es provava les funcions criptogràfiques.</translation>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Error</translation>
+        <source>Key Component</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancel·lar</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>Navega</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Genera</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Fitxers de clau</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Tots els fitxers</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Crea un arxiu clau...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Seleccioneu un arxiu clau</translation>
     </message>
 </context>
 <context>
@@ -2595,10 +3265,6 @@ Es tracta d&apos;una migració unidireccional. No obrir la base de dades importa
         <translation>Bases de dades &amp;recents</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Importa</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation>&amp;Ajuda</translation>
     </message>
@@ -2607,14 +3273,6 @@ Es tracta d&apos;una migració unidireccional. No obrir la base de dades importa
         <translation>E&amp;ntrades</translation>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>Copia l&apos;at&amp;ribut a porta-retalls</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Grups</translation>
     </message>
@@ -2643,30 +3301,10 @@ Es tracta d&apos;una migració unidireccional. No obrir la base de dades importa
         <translation>Tanca base de dades</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>&amp;Nova base de dades</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>Combina base de dades KeePassX</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>&amp;Afegir entrada nova</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>&amp;Mostra/Edita l&apos;entrada</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>&amp;Esborra l&apos;entrada</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>&amp;Afegeix un nou grup</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>&amp;Edita el grup</translation>
     </message>
@@ -2679,14 +3317,6 @@ Es tracta d&apos;una migració unidireccional. No obrir la base de dades importa
         <translation>&amp;Desa la base de dades com a...</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Canvia la clau &amp;mestra...</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>&amp;Configuració de la base de dades</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>Configuració de la base de dades</translation>
     </message>
@@ -2695,10 +3325,6 @@ Es tracta d&apos;una migració unidireccional. No obrir la base de dades importa
         <translation>&amp;Clona l&apos;entrada</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>&amp;Cercar</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>Còpia el nom d&apos;&amp;usuari</translation>
     </message>
@@ -2707,10 +3333,6 @@ Es tracta d&apos;una migració unidireccional. No obrir la base de dades importa
         <translation>Còpia el nom d&apos;usuari al porta-retalls</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>Còpia la contrasen&amp;ya</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>Còpia la contrasenya  al porta-retalls</translation>
     </message>
@@ -2723,14 +3345,6 @@ Es tracta d&apos;una migració unidireccional. No obrir la base de dades importa
         <translation>Generador de contrasenyes</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation>Realitza complació automètica</translation>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>&amp;Obre URL</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>&amp;bloqueja la bases de dades</translation>
     </message>
@@ -2763,22 +3377,6 @@ Es tracta d&apos;una migració unidireccional. No obrir la base de dades importa
         <translation>&amp;Exporta a fitxer CSV.</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Importa base de dades KeePass 1...</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>Importa fitxer CSV...</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Re&amp;para la base de dades...</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>Mostra TOTP</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>Configura TOTP...</translation>
     </message>
@@ -2799,14 +3397,6 @@ Es tracta d&apos;una migració unidireccional. No obrir la base de dades importa
         <translation>Error d&apos;accés al fitxer de configuració %1</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>Només de lectura</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Configuració</translation>
     </message>
@@ -2819,255 +3409,405 @@ Es tracta d&apos;una migració unidireccional. No obrir la base de dades importa
         <translation>Tanca KeePassXC</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Base de dades de KeePass 2</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Per favor, toqueu el botó en el seu YubiKey!</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Tots els fitxers</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Obre la base de dades</translation>
+        <source>&amp;Donate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Desa base de dades reparada</translation>
+        <source>Report a &amp;bug</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Ha fallat l&apos;escriptura en la base de dades.</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Per favor, toqueu el botó en el seu YubiKey!</translation>
+        <source>&amp;Import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
+        <source>Copy att&amp;ribute...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>OpenSSHKey</name>
+    <name>Merger</name>
     <message>
-        <source>Invalid key file, expecting an OpenSSH key</source>
+        <source>Creating missing %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>PEM boundary mismatch</source>
+        <source>Relocating %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Base64 decoding failed</source>
+        <source>Overwriting %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key file way too small.</source>
+        <source>older entry merged from database &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key file magic header id invalid</source>
+        <source>Adding backup for older target %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Found zero keys</source>
+        <source>Adding backup for older source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to read public key.</source>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Corrupted key file, reading private key failed</source>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>No private key payload to decrypt</source>
+        <source>Synchronizing from newer source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Trying to run KDF without cipher</source>
+        <source>Synchronizing from older source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase is required to decrypt this key</source>
+        <source>Deleting child %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key derivation failed, key file corrupted?</source>
+        <source>Deleting orphan %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Decryption failed, wrong passphrase?</source>
+        <source>Changed deleted objects</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unexpected EOF while reading public key</source>
+        <source>Adding missing icon %1</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
     <message>
-        <source>Unexpected EOF while reading private key</source>
+        <source>Create a new KeePassXC database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t write public key as it is empty</source>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Arrel</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unexpected EOF when writing public key</source>
+        <source>En&amp;cryption Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t write private key as it is empty</source>
+        <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"/>
     </message>
     <message>
-        <source>Unexpected EOF when writing private key</source>
+        <source>Advanced Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported key type: %1</source>
+        <source>Simple Settings</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
     <message>
-        <source>Unknown cipher: %1</source>
+        <source>Encryption Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cipher IV is too short for MD5 kdf</source>
+        <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"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
     <message>
-        <source>Unknown KDF: %1</source>
+        <source>Database Master Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unknown key type: %1</source>
+        <source>A master key known only to you protects your database.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>NewDatabaseWizardPageMetaData</name>
     <message>
-        <source>Dialog</source>
-        <translation>Diàleg</translation>
+        <source>General Database Information</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>Requerit per a accedir a les seves bases de dades des de ChromeIPass o PassIFox</translation>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>Habilita el servidor KeePassHTTP</translation>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>General</translation>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>M&amp;ostra una notificació quan es demanen credencials</translation>
+        <source>Base64 decoding failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>Només retorna les millors coincidències per a una adreça URL específica en lloc de totes les entrades per al domini.</translation>
+        <source>Key file way too small.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return only best matching entries</source>
-        <translation>Retorna només les millors coincidències de les entrades</translation>
+        <source>Key file magic header id invalid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Sol·licitar el desbloqueig de la base de dades si està blocada</translation>
+        <source>Found zero keys</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation>Només s&apos;han retornat les entrades amb el mateix patró (http://, https://, ftp: / /,...).</translation>
+        <source>Failed to read public key.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Match URL schemes</source>
-        <translation>Torna les coincidències amb patrons URL</translation>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Ordena les entrades coincidents per nom d&apos;&amp;usuari</translation>
+        <source>No private key payload to decrypt</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Ordena les entrades coincidents per títol</translation>
+        <source>Trying to run KDF without cipher</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>Suprimeix totes les claus d&apos;encriptació compartides de la base de dades activa</translation>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>Esbo&amp;rra tots els permisos emmagatzemats de les entrades a la base de dades activa</translation>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>Generador de contrasenyes</translation>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Avançat</translation>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Permet l&apos;&amp;accés a les entrades sempre</translation>
+        <source>Unexpected EOF while reading private key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Permet l&apos;act&amp;ualització de les entrades, sempre</translation>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>Només s&apos;ha de connectar amb un client, la base de dades seleccionada.</translation>
+        <source>Unexpected EOF when writing public key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>&amp;Cerca en totes les bases de dades obertes, entrades coincidents</translation>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>L&apos;actualització o creació de camps de test no està suportada.</translation>
+        <source>Unexpected EOF when writing private key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>Retorna camps avançats de text que comencen amb &quot;KPH: &quot;</translation>
+        <source>Unsupported key type: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP Port:</translation>
+        <source>Cipher IV is too short for MD5 kdf</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Port per defecte: 19455</translation>
+        <source>Unknown KDF: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC escolta a aquest port en 127.0.0.1</translation>
+        <source>Unknown key type: %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;Atenció:&lt;/b&gt; Canviar les següents opcions és perillós!</translation>
+        <source>Enter password:</source>
+        <translation>Introduïu la contrasenya:</translation>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <source>Confirm password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>No podeu utilitzar ports privilegiats</translation>
+        <source>Password</source>
+        <translation>Contrasenya</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>No es poden utilitzar ports privilegiats inferiors a 1024!
-Utilitza per defecte port 19455.</translation>
+        <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"/>
+    </message>
+    <message>
+        <source>Password cannot be empty.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passwords do not match.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate master password</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3138,18 +3878,10 @@ Utilitza per defecte port 19455.</translation>
         <translation>Llista de paraules:</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Nombre de paraules:</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>Separador de paraula:</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>Genera</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Còpia</translation>
     </message>
@@ -3162,10 +3894,6 @@ Utilitza per defecte port 19455.</translation>
         <translation>Tanca</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>Aplica</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>Entropia: %1 bit(s)</translation>
     </message>
@@ -3193,51 +3921,200 @@ Utilitza per defecte port 19455.</translation>
         <comment>Password quality</comment>
         <translation>Excel·lent</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Avançat</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>QObject</name>
+    <name>QApplication</name>
     <message>
-        <source>Database not opened</source>
+        <source>KeeShare</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>QFileDialog</name>
     <message>
-        <source>Database hash not available</source>
+        <source>Select</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>QMessageBox</name>
     <message>
-        <source>Client public key not received</source>
+        <source>Overwrite</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot decrypt message</source>
+        <source>Delete</source>
+        <translation>Suprimeix</translation>
+    </message>
+    <message>
+        <source>Move</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
+        <source>Empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Action cancelled or denied</source>
+        <source>Remove</source>
+        <translation>Suprimiu</translation>
+    </message>
+    <message>
+        <source>Skip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <source>Disable</source>
+        <translation>Inhabilita</translation>
+    </message>
+    <message>
+        <source>Merge</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>KeePassXC association failed, try again</source>
+        <source>Database not opened</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key change was not successful</source>
+        <source>Database hash not available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Encryption key is not recognized</source>
+        <source>Client public key not received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot decrypt message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>No saved databases found</source>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -3366,10 +4243,6 @@ Utilitza per defecte port 19455.</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3448,12 +4321,6 @@ Available commands:
         <translation>error de lectura del dispositiu</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>fitxer buit!
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation>cadena mal formada</translation>
     </message>
@@ -3462,30 +4329,6 @@ Available commands:
         <translation>falta la cometa de tancament</translation>
     </message>
     <message>
-        <source>AES: 256-bit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Twofish: 256-bit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>ChaCha20: 256-bit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 4)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 3.1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Group</source>
         <translation>Grup</translation>
     </message>
@@ -3514,10 +4357,6 @@ Available commands:
         <translation>Creat</translation>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Browser Integration</source>
         <translation>Integració amb el navegador</translation>
     </message>
@@ -3546,40 +4385,446 @@ Available commands:
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Wordlist for the diceware generator.
+[Default: EFF English]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new random password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>count</source>
+        <comment>CLI parameter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist for the diceware generator.
-[Default: EFF English]</source>
+        <source>Invalid value for password length: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Generate a new random password.</source>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Length of the generated password.</source>
+        <source>Length of the generated password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
+        <source>Use lowercase characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
+        <source>Use uppercase characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
+        <source>Use numbers.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
+        <source>Use special characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
+        <source>Use extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>El fitxer de bloqueig d&apos;instància única no és vàlid. Execute una instància nova.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>No s&apos;ha pogut crear l&apos;arxiu de bloqueig. Inhabilitat el mode de instància única.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - gestor de contrasenyes multi-plataforma</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>Noms de les bases de dades de contrasenya per a obrir (*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>camí cap a un fitxer personalitzat de configuració</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>Arxiu clau de la base de dades</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>llegiu la contrasenya de la base de dades des de l&apos;entrada estàndard (stdin)</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Ja s&apos;està executant una altra instància de KeePassXC.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Error mentre es provava les funcions criptogràfiques.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Error</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -3618,328 +4863,416 @@ Available commands:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
     <message>
-        <source>Search...</source>
-        <translation>Cerca...</translation>
+        <source>Agent connection failed.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Cerca</translation>
+        <source>Agent protocol error.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Neteja</translation>
+        <source>No agent running, cannot add identity.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Distingeix entre majúscules i minúscules</translation>
+        <source>No agent running, cannot remove identity.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Limit search to selected group</source>
-        <translation>Limitar la cerca al grup seleccionat</translation>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>Service</name>
+    <name>SearchHelpWidget</name>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC: Nova petició de associació de clau</translation>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation>S&apos;ha rebut una sol·licitud d&apos;associació per a la citada clau.
-Voleu permetre l&apos;accés a la base de dades KeePassXC?
- Doneu-li un nom únic per a poder identificar-la i seleccione acceptar.</translation>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: Voleu sobreescriure la clau existent?</translation>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Ja existeix una clau de xifrat compartida amb el nom &quot;%1&quot;.
-Voleu sobreescriure-la?</translation>
+        <source>Modifiers</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: Actualitza l&apos;entrada</translation>
+        <source>exclude term from results</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Voleu actualitzar la informació en %1 - %2?</translation>
+        <source>match term exactly</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Base de dades bloquejada!</translation>
+        <source>use regex in term</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>La base de dades activa està bloquejada!
-Per favor, desbloqueu  la base de dades seleccionada o escolliu-ne una altra.</translation>
+        <source>Fields</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Claus de la base de dades eliminades</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <source>Term Wildcards</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: No s&apos;han trobat claus</translation>
+        <source>match anything</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>No s&apos;han trobat claus d&apos;encriptació compartides en la configuració de KeePassHttp.</translation>
+        <source>match one</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: La configuració no està disponible!</translation>
+        <source>logical OR</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>La base de dades activa no conté cap entrada de configuració de KeePassHttp.</translation>
+        <source>Examples</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SearchWidget</name>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>Eliminant permisos emmagatzemats...</translation>
+        <source>Search</source>
+        <translation>Cerca</translation>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>Avorta</translation>
+        <source>Clear</source>
+        <translation>Neteja</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Permisos eliminats</translation>
+        <source>Limit search to selected group</source>
+        <translation>Limitar la cerca al grup seleccionat</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: No s&apos;ha trobat cap entrada amb permisos!</translation>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>La base de dades activa no conté cap entrada amb permisos.</translation>
+        <source>Case sensitive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SettingsWidget</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>Application Settings</source>
-        <translation>Configuració de l&apos;aplicació</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>General</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>Seguretat</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>Error d&apos;accés al fitxer de configuració %1</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>Configuració bàsica</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Obriu només una sola instància del KeePassXC</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>Recordeu les últimes bases de dades</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Recordeu els últims arxius clau i motxilles de seguretat</translation>
+        <source>Key:</source>
+        <translation>Clau:</translation>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Carregueu les bases de dades anteriors a l&apos;obrir el KeepassXC</translation>
+        <source>Generate</source>
+        <translation>Genera</translation>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>Deseu en tancar de forma automàtica</translation>
+        <source>Import</source>
+        <translation>Importa</translation>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>Deseu després de cada canvi de forma automàtica</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </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>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>Minimitzeu en copiar al porta-retalls</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Minimitzeu la finestra a l&apos;obrir l&apos;aplicació</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>Utilitzeu la icona del grup al crear una entrada</translation>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </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>
+        <source>Remove</source>
+        <translation>Suprimiu</translation>
     </message>
     <message>
-        <source>Hide the Details view</source>
+        <source>Path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>Mostreu una icona a la safata del sistema</translation>
+        <source>Status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>Amagueu la finestra a la safata del sistema quan es minimitze</translation>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
-        <translation>Amagueu la finestra a la safata del sistema en lloc de tancar KeepassXC</translation>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
+        <source>Trusted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Idioma</translation>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Compleció automàtica</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
+        <source>KeeShare key file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation>Pregunteu sempre abans d&apos;efectuar la compleció automàtica</translation>
+        <source>All files</source>
+        <translation>Tots els fitxers</translation>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Drecera global de compleció automàtica</translation>
+        <source>Select path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>Retard de la compleció automàtica</translation>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation> ms</translation>
+        <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"/>
     </message>
     <message>
-        <source>Startup</source>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>File Management</source>
+        <source>Import from container without signature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
+        <source>Import from container with certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>General</translation>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
-        <translation>Temps excedits</translation>
+        <source>Never</source>
+        <translation>Mai</translation>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>Neteja el porta-retalls després</translation>
+        <source>Always</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> sec</translation>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>Bloquegeu les bases de dades després d&apos;estar inactives per</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Conveniència</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </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>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>Bloquegeu les bases de dades després minimitzar la finestra</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>No requerir la repetició de la contrasenya quan aquesta és visible</translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Mostreu per defecte les contrasenyes en text sense xifrar</translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
+        <source>Untrusted import prevented</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide entry notes by default</source>
+        <source>Successful signed import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>Privacitat</translation>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>Utilitzeu Google com a alternativa per a descarregar icones de llocs web</translation>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpDialog</name>
+    <message>
+        <source>Timed Password</source>
+        <translation>Contrasenya per temps</translation>
+    </message>
+    <message>
+        <source>000000</source>
+        <translation>000000</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Còpia</translation>
+    </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
+    <message>
+        <source>Copy</source>
+        <translation>Còpia</translation>
+    </message>
+    <message>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>There was an error creating the QR code.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Closing in %1 seconds.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation>Organització TOTP</translation>
@@ -3961,59 +5294,84 @@ Per favor, desbloqueu  la base de dades seleccionada o escolliu-ne una altra.</t
         <translation>Utilitza la configuració personalitzada</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>Nota: Canvieu aquesta configuració només si sabeu què esteu fent.</translation>
+        <source>Custom Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Time step:</source>
         <translation>Intervals:</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8 dígits</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> sec</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>Mida del codi:</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6 dígits</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>Mida del codi:</translation>
+        <source>7 digits</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> sec</translation>
+        <source>8 digits</source>
+        <translation>8 dígits</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>Contrasenya per temps</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Còpia</translation>
+        <source>Close</source>
+        <translation>Tanca</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>Caduca el</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>segons</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>Desbloqueja la base de dades</translation>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4048,41 +5406,25 @@ Per favor, desbloqueu  la base de dades seleccionada o escolliu-ne una altra.</t
     </message>
 </context>
 <context>
-    <name>main</name>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>Remove an entry from the database.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>Camí de la base de dades.</translation>
+        <source>Refresh</source>
+        <translation>Actualitza</translation>
     </message>
     <message>
-        <source>Path of the entry to remove.</source>
+        <source>YubiKey Challenge-Response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - gestor de contrasenyes multi-plataforma</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>Noms de les bases de dades de contrasenya per a obrir (*.kdbx)</translation>
-    </message>
-    <message>
-        <source>path to a custom config file</source>
-        <translation>camí cap a un fitxer personalitzat de configuració</translation>
-    </message>
-    <message>
-        <source>key file of the database</source>
-        <translation>Arxiu clau de la base de dades</translation>
+        <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"/>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>llegiu la contrasenya de la base de dades des de l&apos;entrada estàndard (stdin)</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Parent window handle</source>
+        <source>No YubiKey inserted.</source>
         <translation type="unfinished"/>
     </message>
 </context>
diff --git a/share/translations/keepassx_cs.ts b/share/translations/keepassx_cs.ts
index 1bdd41bec..6a401d255 100644
--- a/share/translations/keepassx_cs.ts
+++ b/share/translations/keepassx_cs.ts
@@ -38,12 +38,6 @@
         <translation>Zkopírovat do schránky</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>Verze %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>Revize: %1</translation>
     </message>
@@ -76,35 +70,50 @@ Jádro systému: %3 %4</translation>
         <translation>Tým KeePassXC děkuje zvláště vývojáři debfx za vytvoření původního KeePassX.</translation>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
+        <source>Version %1</source>
+        <translation>Verze %1
+</translation>
+    </message>
+    <message>
+        <source>Build Type: %1</source>
         <translation>Typ sestavení: %1
 </translation>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>Potvrzení přístupu pro KeePassXC HTTP</translation>
+        <source>Auto-Type</source>
+        <translation>Automatické vyplňování</translation>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>Zapamatovat si toto rozhodnutí</translation>
+        <source>Browser Integration</source>
+        <translation>Napojení webového prohlížeče</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Umožnit</translation>
+        <source>SSH Agent</source>
+        <translation>SSH agent</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>Odepřít</translation>
+        <source>YubiKey</source>
+        <translation>YubiKey</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>%1 si vyžádalo přístup k heslům u následujících položek.
-Umožnit přístup?</translation>
+        <source>TouchID</source>
+        <translation>TouchID</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Žádné</translation>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -113,6 +122,277 @@ Umožnit přístup?</translation>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>Zapnout SSH agenta (vyžaduje restart)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Nastavení aplikace</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Obecné</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Zabezpečení</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Chyba přístupu k souboru s nastaveními %1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Základní nastavení</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>Spouštění</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Spouštět pouze jedinou instanci KeePassXC</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Pamatovat si nedávno otevřené databáze</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Pamatovat si minule použité soubory s klíči a zabezpečovací klíčenky</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Při spouštění aplikace načíst minule otevřené databáze</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>Spouštět aplikaci s minimalizovaným oknem</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>Správa souboru</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation>Ukládat databázové soubory bezpečně (může být neslučitelné s Dropbox, atd.)</translation>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation>Před uložením zazálohovat databázový soubor</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Po každé změně hned automaticky uložit</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Před ukončením aplikace automaticky uložit případné změny</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Neoznačovat databázi jako upravenou při změnách, nepostihujících údaje (např. rozkliknutí skupin)</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>V případě úpravy zvenčí, automaticky znovu načíst databázi</translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>Správa záznamu</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>Pro vytvářený záznam použít ikonu skupiny, pod kterou je vytvářen</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Po zkopírování údaje do schránky odklidit okno aplikace jeho automatickou minimalizací</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation>Skrýt panel náhledu položky</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Obecné</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation>Skrýt lištu nástrojů (ikony)</translation>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation>Namísto ukončení aplikaci minimalizovat</translation>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Zobrazovat ikonu v oznamovací oblasti systémového panelu</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>Tmavá ikona v oznamovací oblasti systémového panelu</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Minimalizovat okno aplikace do oznamovací oblasti systémového panelu</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Jazyk</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Automatické vyplňování</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>Použít titulek položky pro hledání shody s okny pro všeobecné automatické vyplňování</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>Použít URL adresu položky pro hledání shody s okny pro všeobecné automatické vyplňování</translation>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>Vždy se zeptat před provedením automatického vyplnění</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Klávesová zkratka pro všeobecné automatické vyplňování</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation>Prodleva automatického vyplnění</translation>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation> ms</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation>Prodleva zahájení automatického vyplňování</translation>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>Časové limity</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>Vymazat obsah schránky po uplynutí</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>sek.</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>Uzamknout databázi při nečinnosti delší než</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation> min</translation>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation>Zapomenout TouchID po nečinnosti trvající</translation>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>Pohodlí</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Zamknout databáze když je zamčeno sezení uživatele v operačním systému nebo je zavřeno víko notebooku</translation>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation>Zapomenout TouchID při uzamčení relace nebo při zavření víka s displejem</translation>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>Při minimalizaci okna uzamknout databáze</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation>Po provedení automatického vyplnění opět zamknout dříve uzamčenou databázi.</translation>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>Pokud je viditelné, nevyžadovat zopakování zadání hesla</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation>Neskrývat hesla při jejich upravování</translation>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation>Nepoužívat pro prázdné kolonky pro heslo zástupnou výplň</translation>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation>Skrýt hesla v panelu náhledu položky</translation>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>Skrývat ve výchozím stavu poznámky k položkám</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>Soukromí</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation>Použít DuckDuckGo jako náhradní zdroj pro stahování ikon webů</translation>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -153,11 +433,11 @@ Umožnit přístup?</translation>
     </message>
     <message>
         <source>Sequence</source>
-        <translation>Posloupnost</translation>
+        <translation>Pořadí</translation>
     </message>
     <message>
         <source>Default sequence</source>
-        <translation>Výchozí posloupnost</translation>
+        <translation>Výchozí pořadí</translation>
     </message>
 </context>
 <context>
@@ -216,6 +496,27 @@ Umožnit přístup?</translation>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation>KeePassXC-Browser Uložit položku</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Zrušit</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation>Máte otevřeno vícero databází.
+Vyberte databázi, do které chcete přihlašovací údaje uložit.</translation>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -289,14 +590,6 @@ Umožnit přístup?</translation>
         <translation>Seřadit odpovídající přihlašovací údaje podle &amp;uživatelského jména</translation>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>O&amp;dpojit veškeré prohlížeče</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>Zapomenout všechna zapamatovaná o&amp;právnění</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>Pokročilé</translation>
     </message>
@@ -325,7 +618,7 @@ Umožnit přístup?</translation>
     </message>
     <message>
         <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>Odpovědět kolonkami pok&amp;ročilých textových řetězců které začínají na „KPH: “</translation>
+        <translation>Odpovědět také kolonkami pok&amp;ročilých textových řetězců které začínají na „KPH: “</translation>
     </message>
     <message>
         <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
@@ -362,14 +655,6 @@ Umožnit přístup?</translation>
         <translation>&lt;b&gt;Varování:&lt;/b&gt; Následující předvolby mohou být nebezpečné!</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>Spustitelné soubor (*.exe);;Všechny soubory (*.*)</translation>
-    </message>
-    <message>
-        <source>Executable Files (*)</source>
-        <translation>Spustitelné soubory (*)</translation>
-    </message>
-    <message>
         <source>Select custom proxy location</source>
         <translation>Vybrat uživatelem určené umístění zprostředkovávající aplikace</translation>
     </message>
@@ -377,6 +662,31 @@ Umožnit přístup?</translation>
         <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
         <translation>Je nám líto, ale KeePassXC-Browser v tuto chvíli není ve snap vydáních podporován.</translation>
     </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation>Aby fungovalo napojení na prohlížeč, je třeba KeePassXC. &lt;br /&gt; Stáhnete ho pro %1 a %2.</translation>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation>&amp;Tor Browser</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: </source>
+        <translation>&lt;b&gt;Varování&lt;/b&gt;, aplikace keepassxc-proxy nebyla nalezena! &lt;br /&gt;Zkontrolujte instalační složku KeePassXC nebo v pokročilých možnostech potvrďte uživatelsky určené umístění.&lt;br /&gt;Napojení na prohlížeč NEBUDE FUNGOVAT bez proxy aplikace. &lt;br /&gt; Očekávané umístění:</translation>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation>Spustitelné soubory</translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation>Veškeré soubory</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"/>
+    </message>
 </context>
 <context>
     <name>BrowserService</name>
@@ -417,152 +727,46 @@ Přejete si ho přepsat?</translation>
         <translation>Chcete aktualizovat údaj v %1 – %2?</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Databáze uzamčena!</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Právě otevřená databáze je uzamčená!
-Buď jí odemkněte, nebo vyberte jinou, odemčenou.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Nastavení nejsou k dispozici!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation>Nyní otevřená databáze neobsahuje položku nastavení.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Nebyly nalezeny žádné klíče</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation>V nastavení KeePassXC nebyly nalezeny žádné sdílené šifrovací klíče.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Klíče odebrány z databáze</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation><numerusform>Úspěšně odebrán %n šifrovací klíč z nastavení KeePassXC.</numerusform><numerusform>Úspěšně odebrány %n šifrovací klíče z nastavení KeePassXC.</numerusform><numerusform>Úspěšně odebráno %n šifrovacích klíčů z nastavení KeePassXC.</numerusform><numerusform>Úspěšně odebráno %n šifrovacích klíčů z nastavení KeePassXC.</numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>Odebírání uložených oprávnění…</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>Přerušit</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Odebraná oprávnění</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation><numerusform>Úspěšně odebrána oprávnění z %n položky.</numerusform><numerusform>Úspěšně odebrána oprávnění ze %n položek.</numerusform><numerusform>Úspěšně odebrána oprávnění z %n položek.</numerusform><numerusform>Úspěšně odebrána oprávnění z %n položek.</numerusform></translation>
-    </message>
-    <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Nebyl nalezen žádný záznam s oprávněními!</translation>
+        <source>Converting attributes to custom data…</source>
+        <translation>Převádění atributů na uživatelsky určená data…</translation>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Právě otevřená databáze neobsahuje záznam s oprávněními.</translation>
-    </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>Heslo</translation>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation>KeePassXC: Převedené KeePassHTTP atributy</translation>
     </message>
     <message>
-        <source>Enter password:</source>
-        <translation>Zadejte heslo:</translation>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation>Úspěšně převedeny atributy z %1 položek.
+Přesunuto %2 klíčů do uživatelsky určených dat.</translation>
     </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>Zopakujte heslo:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>Soubor s &amp;klíčem</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>Procházet</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Vytvořit</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>&amp;Výzva–odpověď</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Načíst znovu</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>Soubory s klíči</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>Veškeré soubory</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>Vytvořit soubor s klíčem…</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>Nedaří se vytvořit soubor s klíčem:</translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>Vyberte soubor s klíčem</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Prázdné heslo</translation>
-    </message>
-    <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>Opravdu ponechat bez hesla, tedy nechráněné?</translation>
-    </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>Nepodařilo se vám zadat heslo do obou kolonek stejně.</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation><numerusform>%n klíč úspěšně přesunut do uživatelsky určených dat.</numerusform><numerusform>%n klíče úspěšně přesunuty do uživatelsky určených dat.</numerusform><numerusform>%n klíčů úspěšně přesunuto do uživatelsky určených dat.</numerusform><numerusform>%n klíčy úspěšně přesunuty do uživatelsky určených dat.</numerusform></translation>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>Nepodařilo se nastavit %1 jako soubor s klíčem:
-%2</translation>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation>KeePassXC: Nenalezena žádná položka, která má KeePassHTTP atributy!</translation>
     </message>
     <message>
-        <source>Legacy key file format</source>
-        <translation>Starší formát souboru s klíčem</translation>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation>Právě otevřená databáze neobsahuje žádnou položku s atributy KeePassHTTP.</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>Používáte starší formát souboru s klíčem, který v budoucnu nemusí být podporován.
-
-Zvažte vytvoření nového souboru s klíčem.</translation>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation>KeePassXC: zjištěna nastavení starého napojení na webový prohlížeč</translation>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>Změna hlavního klíče se nezdařila: není připojeno žádné YubiKey zařízení.</translation>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation>Byla zjištěna nastavení starého napojení na prohlížeč.
+Chcete povýšit nastavení na nejnovější standard?
+Toto je nezbytné pro zachování kompatibility se zásuvným modulem pro prohlížeč.</translation>
     </message>
 </context>
 <context>
@@ -608,7 +812,7 @@ Zvažte vytvoření nového souboru s klíčem.</translation>
     </message>
     <message>
         <source>Text is qualified by</source>
-        <translation>Text je určen pomocí</translation>
+        <translation>Text je zařazován pomocí</translation>
     </message>
     <message>
         <source>Fields are separated by</source>
@@ -624,11 +828,11 @@ Zvažte vytvoření nového souboru s klíčem.</translation>
     </message>
     <message>
         <source>Number of headers line to discard</source>
-        <translation>Počet řádků hlavičky, které zahodit</translation>
+        <translation>Počet řádek s hlavičkou, kterou zahodit</translation>
     </message>
     <message>
         <source>Consider &apos;\&apos; an escape character</source>
-        <translation>Považovat „\“ za význam zbavující (escape) znak</translation>
+        <translation>Považovat „\“ za únikový znak</translation>
     </message>
     <message>
         <source>Preview</source>
@@ -643,14 +847,6 @@ Zvažte vytvoření nového souboru s klíčem.</translation>
         <translation>Nenachází se v CSV souboru</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>Prázdný název kolonky</translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>sloupec</translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>Importováno z CSV souboru</translation>
     </message>
@@ -659,48 +855,85 @@ Zvažte vytvoření nového souboru s klíčem.</translation>
         <translation>Původní data:</translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>V CSV soubory byly zjištěny chyby!</translation>
+        <source>Error</source>
+        <translation>Chyba</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation>další zprávy přeskočeny]</translation>
+        <source>Empty fieldname %1</source>
+        <translation>Prázdný název kolonky %1</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Chyba</translation>
+        <source>column %1</source>
+        <translation>sloupec %1</translation>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>CSV import: chyby zápisu:
-</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation>V CSV soubory byly zjištěny chyby!</translation>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>Chyba</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation><numerusform>[%n další zpráva přeskočena]</numerusform><numerusform>[%n další zprávy přeskočeny]</numerusform><numerusform>[%n dalších zpráv přeskočeno]</numerusform><numerusform>[%n další zprávy přeskočeny]</numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Nedaří se vypočítat hlavní klíč</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation>CSV import: chyby zápisu:
+%1</translation>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
-        <translation><numerusform>%n bajt,</numerusform><numerusform>%n bajty,</numerusform><numerusform>%n bajtů,</numerusform><numerusform>%n bajtů,</numerusform></translation>
+        <source>%n column(s)</source>
+        <translation><numerusform>%n sloupec</numerusform><numerusform>%n sloupce</numerusform><numerusform>%n sloupců</numerusform><numerusform>%n sloupců</numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation>%1, %2, %3</translation>
     </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
-        <translation><numerusform>%n řádek,</numerusform><numerusform>%n řádky,</numerusform><numerusform>%n řádků,</numerusform><numerusform>%n řádků,</numerusform></translation>
+        <source>%n byte(s)</source>
+        <translation><numerusform>%n bajt</numerusform><numerusform>%n bajty</numerusform><numerusform>%n bajtů</numerusform><numerusform>%n bajty</numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
-        <translation><numerusform>%n sloupec</numerusform><numerusform>%n sloupce</numerusform><numerusform>%n sloupců</numerusform><numerusform>%n sloupců</numerusform></translation>
+        <source>%n row(s)</source>
+        <translation><numerusform>%n řádek</numerusform><numerusform>%n řádky</numerusform><numerusform>%n řádků</numerusform><numerusform>%n řádky</numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Kořen</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>Soubor %1 neexistuje.</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Soubor %1 se nedaří otevřít.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation>Chyba při čtení databáze: %1</translation>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation>Nedaří se uložit, databáze nemá název.</translation>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation>Do souboru nelze zapisovat, protože je otevřen v režimu pouze pro čtení.</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation>Odemknout databázi – KeePassXC</translation>
     </message>
 </context>
 <context>
@@ -730,14 +963,6 @@ Zvažte vytvoření nového souboru s klíčem.</translation>
         <translation>Výzva–odpověď:</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Databázi se nedaří otevřít.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Nedaří se otevřít soubor s klíčem</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation>Starý formát souboru s klíčem</translation>
     </message>
@@ -766,105 +991,174 @@ Zvažte vytvoření nového souboru s klíčem.</translation>
         <source>Select key file</source>
         <translation>Vyberte soubor s klíčem</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>Opravit databázi</translation>
+        <source>TouchID for quick unlock</source>
+        <translation>TouchID pro rychlé odemčení</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Chyba</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation>Databázi se nedaří otevřít:
+%1</translation>
+    </message>
+    <message>
+        <source>Can't open key file:
+%1</source>
+        <translation>Soubor s klíčem se nedaří otevřít:
+%1</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Nedaří se otevřít soubor s klíčem</translation>
+        <source>Passwords</source>
+        <translation>Hesla</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Databázi se nedaří otevřít.</translation>
+        <source>Advanced Settings</source>
+        <translation>Pokročilá nastavení</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Databázi se podařilo v pořádku otevřít. Není třeba žádného zásahu.</translation>
+        <source>General</source>
+        <translation>Obecné</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>Úspěch</translation>
+        <source>Security</source>
+        <translation>Zabezpečení</translation>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>Databáze je úspěšně opravená.
-Nyní je možné ji uložit.</translation>
+        <source>Master Key</source>
+        <translation>Hlavní klíč</translation>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>Databázi se nedaří opravit.</translation>
+        <source>Encryption Settings</source>
+        <translation>Nastavení šifrování</translation>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation>Napojení webového prohlížeče</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>Obecné</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation>Nastavení pro KeePassXC-Browser</translation>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>Šifrování</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>O&amp;dpojit veškeré prohlížeče</translation>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Počet průchodů je příliš vysoký</translation>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation>Zapom&amp;enout v položkách veškerá nastavení specifická pro daný web</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>Používáte velmi vysoký počet průchodů transformace klíče s Argnon2.
-
-Pokud tento počet ponecháte, otevírání databáze může trvat hodiny až dny (nebo dokonce déle)!</translation>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation>Přesunout KeePassHTTP atributy do uživatelsky určených dat v KeePassX&amp;C-Browser</translation>
     </message>
     <message>
-        <source>Understood, keep number</source>
-        <translation>Rozumím, počet ponechat</translation>
+        <source>Stored keys</source>
+        <translation>Uložené klíče</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>Zrušit</translation>
+        <source>Remove</source>
+        <translation>Odebrat</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Počet průchodů je příliš nízký</translation>
+        <source>Delete the selected key?</source>
+        <translation>Smazat označený klíč?</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>Používáte velmi nízký počet průchodů transformace funkcí pro odvození klíče (KDF) a šifrou AES.
-
-Pokud tento počet ponecháte, může být velmi snadné prolomit šifrování vaší databáze!</translation>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation>Opravdu chcete označený klíč smazat?
+Toto může zabránit spojení se zásuvným modulem prohlížeče.</translation>
     </message>
     <message>
-        <source>KDF unchanged</source>
-        <translation>Funkce pro odvození klíče (KDF) nezměněna</translation>
+        <source>Key</source>
+        <translation>Klíč</translation>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
-        <translation>Nepodařilo se transformovat klíč s novými parametry funkce pro odvození klíče (KDF), ta proto nezměněna.</translation>
+        <source>Value</source>
+        <translation>Hodnota</translation>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation>Pro zpřístupnění těchto nastavení zapněte Napojení na webový prohlížeč.</translation>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation>Odpojit veškeré prohlížeče</translation>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation>Opravdu chcete odpojit všechny prohlížeče?
+To může zabránit spojení se zásuvným modulem prohlížeče.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Nebyly nalezeny žádné klíče</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation>V nastavení KeePassXC nenalezeny žádné sdílené šifrovací klíče.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Klíče odebrány z databáze</translation>
     </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
-        <translation><numerusform> MiB</numerusform><numerusform> MiB</numerusform><numerusform> MiB</numerusform><numerusform> MiB</numerusform></translation>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation><numerusform>Z nastavení KeePassXC úspěšně odebrán %n šifrovací klíč.</numerusform><numerusform>Z nastavení KeePassXC úspěšně odebrány %n šifrovací klíče.</numerusform><numerusform>Z nastavení KeePassXC úspěšně odebráno %n šifrovacích klíčů.</numerusform><numerusform>Z nastavení KeePassXC úspěšně odebrány %n šifrovací klíče.</numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation>Zapomenout v položkách veškerá nastavení specifická pro daný web</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>Opravdu chcete zapomenout veškerá nastavení pro dané weby na každé položce?
+Oprávnění pro přístup k položkám budou odvolána.</translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Odebírání uložených oprávnění…</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Přerušit</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Odebraná oprávnění</translation>
     </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
-        <translation><numerusform>vlákno</numerusform><numerusform>vlákna</numerusform><numerusform>vláken</numerusform><numerusform>vláken</numerusform></translation>
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation><numerusform>Z %n položky úspěšně odebrána oprávnění.</numerusform><numerusform>Ze %n položek úspěšně odebrána oprávnění.</numerusform><numerusform>Z %n položek úspěšně odebrána oprávnění.</numerusform><numerusform>Ze %n položek úspěšně odebrána oprávnění.</numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: Nebyl nalezen žádný záznam s oprávněními!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Právě otevřená databáze neobsahuje záznam s oprávněními.</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation>Přesunout KeePassHTTP atributy do uživatelsky určených dat</translation>
+    </message>
+    <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>Opravdu chcete přesunout všechna data starého napojení na prohlížeč na nejnovější standard?
+Toto je nezbytné pro zachování kompatibility se zásuvným modulem pro prohlížeč.</translation>
     </message>
 </context>
 <context>
@@ -901,6 +1195,113 @@ Pokud tento počet ponecháte, může být velmi snadné prolomit šifrování v
         <source>Parallelism:</source>
         <translation>Souběžné zpracovávání:</translation>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation>Doba, kterou rozšifrování trvalo:</translation>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation>?? s</translation>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation>Změnit</translation>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation>100 ms</translation>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation>5 s</translation>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation>Vyšší hodnota poskytuje lepší ochranu, ale otevírání databáze zabere déle.</translation>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation>Formát databáze:</translation>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation>Toto je důležité pouze pokud potřebujete svou databázi používat v ostatních aplikacích.</translation>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation>KDBX 4.0 (doporučeno)</translation>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation>KDBX 3.1</translation>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation>nezměněno</translation>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Počet průchodů je příliš vysoký</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>Používáte velmi vysoký počet průchodů transformace klíče s Argnon2.
+
+Pokud tento počet ponecháte, otevírání databáze může trvat hodiny až dny (nebo dokonce déle)!</translation>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation>Rozumím, počet ponechat</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Zrušit</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Počet průchodů je příliš nízký</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>Používáte velmi nízký počet průchodů transformace funkcí pro odvození klíče (KDF) a šifrou AES.
+
+Pokud tento počet ponecháte, může být velmi snadné prolomit šifrování vaší databáze!</translation>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation>Funkce pro odvození klíče (KDF) nezměněna</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation>Nepodařilo se transformovat klíč s novými parametry funkce pro odvození klíče (KDF), ta proto nezměněna.</translation>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation><numerusform> MiB</numerusform><numerusform> MiB</numerusform><numerusform> MiB</numerusform><numerusform> MiB</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation><numerusform>vlákno</numerusform><numerusform>vlákna</numerusform><numerusform>vláken</numerusform><numerusform>vlákna</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation><numerusform>%1 ms</numerusform><numerusform>%1 ms</numerusform><numerusform>%1 ms</numerusform><numerusform>%1 ms</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -950,91 +1351,112 @@ Pokud tento počet ponecháte, může být velmi snadné prolomit šifrování v
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>Kořen</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Databáze ve formátu KeePass 2</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Veškeré soubory</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Otevřít databázi</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>Soubor nenalezen!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Databázi se nedaří otevřít.</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>Soubor otevřen v režimu pouze pro čtení.</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>Otevřít CSV soubor</translation>
+        <source>Add additional protection...</source>
+        <translation>Přidat další ochranu…</translation>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>CSV soubor</translation>
+        <source>No encryption key added</source>
+        <translation>Nepřidán žádný šifrovací klíč</translation>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>Veškeré soubory (*)</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation>Aby byla vaše databáze zabezpečená, je třeba přidat alespoň jeden šifrovací klíč!</translation>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Sloučit databáze</translation>
+        <source>No password set</source>
+        <translation>Není nastavené žádné heslo</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Otevřít databázi ve formátu KeePass verze 1</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>VAROVÁNÍ! Nenastavili jste heslo. Používání databáze bez hesla je silně nedoporučeno!
+
+Opravdu chcete pokračovat bez hesla?</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>Databáze ve formátu KeePass verze 1</translation>
+        <source>Unknown error</source>
+        <translation>Neznámá chyba</translation>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>Zavřít?</translation>
+        <source>Failed to change master key</source>
+        <translation>Hlavní klíč se nepodařilo změnit</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>„%1“ je právě upravováno.
-Přesto zavřít a zahodit tak změny?</translation>
+        <source>Database Name:</source>
+        <translation>Název databáze:</translation>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>Uložit změny?</translation>
+        <source>Description:</source>
+        <translation>Popis:</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>„%1“ bylo změněno.
-Uložit změny?</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Databáze ve formátu KeePass verze 2</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Zápis do databáze se nezdařil.</translation>
+        <source>All files</source>
+        <translation>Veškeré soubory</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Hesla</translation>
+        <source>Open database</source>
+        <translation>Otevřít databázi</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Uložit databázi jako</translation>
+        <source>CSV file</source>
+        <translation>CSV soubor</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>Sloučit databáze</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Otevřít databázi ve formátu KeePass verze 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>Databáze ve formátu KeePass verze 1</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1045,40 +1467,41 @@ Uložit změny?</translation>
         <translation>Zápis do CSV souboru se nezdařil.</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>Nová databáze</translation>
+        <source>Database creation error</source>
+        <translation>Chyba vytváření databáze</translation>
     </message>
     <message>
-        <source>locked</source>
-        <translation>zamčeno</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>Vytvořená databáze nemá klíč nebo KDF, její uložení je domítnuto.
+Toto je nepochybně chyba, nahlaste ji prosím vývojářům.</translation>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>Uzamknout databázi</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation>Soubor s databází neexistuje nebo není přístupný.</translation>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>Nelze uzamknout databázi, protože ji v tuto chvíli upravujete.
-Pokud chcete změny dokončit, klikněte na Storno. V opačném případě změny zahodíte.</translation>
+        <source>Select CSV file</source>
+        <translation>Vyberte CSV soubor</translation>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>Tato databáze byla upravena.
-Chcete ji před uzamčením uložit?
-Pokud ne, provedené změny budou ztraceny.</translation>
+        <source>New Database</source>
+        <translation>Nová databáze</translation>
     </message>
     <message>
-        <source>Disable safe saves?</source>
-        <translation>Vypnout bezpečná ukládání?</translation>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [nová databáze]</translation>
     </message>
     <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>I přes několikátý pokus se KeePassXC nepodařilo databázi uložit. To je nejspíš způsobeno službou synchronizace souborů, která drží zámek na ukládaném souboru.
-Vypnout bezpečné ukládání a zkusit to znovu?</translation>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [uzamčeno]</translation>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [pouze pro čtení]</translation>
     </message>
 </context>
 <context>
@@ -1088,40 +1511,16 @@ Vypnout bezpečné ukládání a zkusit to znovu?</translation>
         <translation>Hledání…</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>Změnit hlavní klíč</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>Smazat záznam?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>Opravdu chcete nenávratně smazat záznam „%1“?</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Smazat záznamy?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Opravdu chcete nenávratně smazat %1 záznamů?</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Přesunout záznam do Koše?</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>Opravdu chcete přesunout záznam „%1“ do Koše?</translation>
-    </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Přesunout záznamy do Koše?</translation>
+        <translation>Opravdu přesunout záznam &quot;%1&quot; do Koše?</translation>
     </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation><numerusform>Opravdu chcete přesunout %n položku do Koše?</numerusform><numerusform>Opravdu chcete přesunout %n položky do Koše?</numerusform><numerusform>Opravdu chcete přesunout %n položek do Koše?</numerusform><numerusform>Opravdu chcete přesunout %n položek do Koše?</numerusform></translation>
+        <translation><numerusform>Opravdu přesunout %n záznam do Koše? ()</numerusform><numerusform>Opravdu přesunout %n záznamy do Koše? ()</numerusform><numerusform>Opravdu přesunout %n záznamů do Koše?</numerusform><numerusform>Opravdu přesunout %n záznamů do Koše?</numerusform></translation>
     </message>
     <message>
         <source>Execute command?</source>
@@ -1129,25 +1528,17 @@ Vypnout bezpečné ukládání a zkusit to znovu?</translation>
     </message>
     <message>
         <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
-        <translation>Opravdu chcete spustit následující příkaz?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
+        <translation>Opravdu spustit následující příkaz?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
     </message>
     <message>
         <source>Remember my choice</source>
         <translation>Zapamatovat si pro příště</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Smazat skupinu?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>Opravdu chcete nenávratně smazat skupinu „%1“?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Nedaří se vypočítat hlavní klíč</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>Aktuálně žádná databáze.</translation>
     </message>
@@ -1182,99 +1573,114 @@ Do you want to merge your changes?</source>
 Přejete si je sloučit?</translation>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>Nepodařilo se otevřít nový databázový soubor při pokusu o automatické znovunačtení této databáze.</translation>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>Vysypat Koš?</translation>
     </message>
     <message>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
-        <translation>Opravdu natrvalo smazat všechno z Koše?</translation>
+        <translation>Opravdu chcete natrvalo smazat všechno z Koše?</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>Vytvořit token na času založeného jednorázového hesla (TOTP)</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation><numerusform>Opravdu chcete %n položku nadobro smazat?</numerusform><numerusform>Opravdu chcete %n položky nadobro smazat?</numerusform><numerusform>Opravdu chcete %n položek nadobro smazat?</numerusform><numerusform>Opravdu chcete %n položky nadobro smazat?</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation><numerusform>Smazat položku</numerusform><numerusform>Smazat položky</numerusform><numerusform>Smazat položek</numerusform><numerusform>Smazat položky</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation><numerusform>Přesunout položku do Koše?</numerusform><numerusform>Přesunout položky do Koše?</numerusform><numerusform>Přesunout položek do Koše?</numerusform><numerusform>Přesunout položky do Koše?</numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Zavřít</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Soubor otevřen v režimu pouze pro čtení.</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Obecné</translation>
+        <source>Lock Database?</source>
+        <translation>Uzamknout databázi?</translation>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Heslo</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation>Upravujete položku. Přesto zavřít a zahodit tak změny?</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL adresa</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>„%1“ bylo změněno.
+Uložit změny?</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>Skončení platnosti</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation>Databáze byla změněna.
+Uložit změny?</translation>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Uživatelské jméno</translation>
+        <source>Save changes?</source>
+        <translation>Uložit změny?</translation>
     </message>
     <message>
-        <source>Autotype</source>
-        <translation>Automatické vyplnění</translation>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation>Nepodařilo se otevřít nový soubor s databází během pokusu o její opětovné načtení.
+Chyba: %1</translation>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>Hledání</translation>
+        <source>Disable safe saves?</source>
+        <translation>Vypnout bezpečná ukládání?</translation>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>Atributy</translation>
+        <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>I přes několikátý pokus se KeePassXC nepodařilo databázi uložit. To je nejspíš způsobeno službou synchronizace souborů, která drží zámek na ukládaném souboru.
+Vypnout bezpečné ukládání a zkusit to znovu?</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Přílohy</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation>Zápis do databáze se nezdařil.
+%1</translation>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Poznámky</translation>
+        <source>Passwords</source>
+        <translation>Hesla</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>Okno</translation>
+        <source>Save database as</source>
+        <translation>Uložit databázi jako</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>Posloupnost</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Databáze ve formátu KeePass 2</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Hledat</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Vyčistit</translation>
+        <source>Delete group</source>
+        <translation>Smazat skupinu</translation>
     </message>
     <message>
-        <source>Never</source>
-        <translation>Nikdy</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[CHRÁNĚNO]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>Vypnuto</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Zapnuto</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1348,22 +1754,10 @@ Přejete si je sloučit?</translation>
         <translation>Nový atribut</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Potvrdit odebrání</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>Opravdu chcete odebrat tento atribut?</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[CHRÁNĚNO]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation>Pro zobrazení nebo úpravu klikněte na Odkrýt</translation>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>Zítra</translation>
     </message>
@@ -1376,10 +1770,6 @@ Přejete si je sloučit?</translation>
         <translation><numerusform>%n měsíc</numerusform><numerusform>%n měsíce</numerusform><numerusform>%n měsíců</numerusform><numerusform>%n měsíců</numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 rok</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation>Použít vytvořené heslo?</translation>
     </message>
@@ -1391,6 +1781,26 @@ Přejete si je sloučit?</translation>
         <source>Entry updated successfully.</source>
         <translation>Položka úspěšně aktualizována.</translation>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation>Položka má neuložené změny</translation>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation>Nový atribut %1</translation>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation>[CHRÁNĚNO] Pro zobrazení nebo úpravu klikněte na Odhalit</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n rok</numerusform><numerusform>%n roky</numerusform><numerusform>%n let</numerusform><numerusform>%n roky</numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1416,7 +1826,7 @@ Přejete si je sloučit?</translation>
     </message>
     <message>
         <source>Reveal</source>
-        <translation>Odkrýt</translation>
+        <translation>Odhalit</translation>
     </message>
     <message>
         <source>Attachments</source>
@@ -1439,11 +1849,11 @@ Přejete si je sloučit?</translation>
     </message>
     <message>
         <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation>&amp;Převzít výchozí posloupnost automatického vyplňování od skupiny</translation>
+        <translation>Převzít výchozí pořadí automatického vyplňování od skupiny</translation>
     </message>
     <message>
         <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation>Po&amp;užít uživatelem určenou posloupnost automatického vyplňování:</translation>
+        <translation>Po&amp;užít vlastní pořadí automatického vyplňování:</translation>
     </message>
     <message>
         <source>Window Associations</source>
@@ -1632,7 +2042,82 @@ Přejete si je sloučit?</translation>
     </message>
     <message>
         <source>Inherit from parent group (%1)</source>
-        <translation>Převzít z nadřazené skupiny (%1)</translation>
+        <translation>Převzít od nadřazené skupiny (%1)</translation>
+    </message>
+</context>
+<context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulář</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Heslo:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1659,11 +2144,11 @@ Přejete si je sloučit?</translation>
     </message>
     <message>
         <source>&amp;Use default Auto-Type sequence of parent group</source>
-        <translation>Převzít výchozí posloupnost a&amp;utomatického vyplňování z nadřazené skupiny</translation>
+        <translation>Převzít výchozí pořadí a&amp;utomatického vyplňování nadřazené skupiny</translation>
     </message>
     <message>
         <source>Set default Auto-Type se&amp;quence</source>
-        <translation>&amp;Nastavit výchozí posloupnost automatického vyplňování</translation>
+        <translation>Nastavit výchozí pořadí automatického vyplňování</translation>
     </message>
 </context>
 <context>
@@ -1674,15 +2159,15 @@ Přejete si je sloučit?</translation>
     </message>
     <message>
         <source>Use custo&amp;m icon</source>
-        <translation>Použít uživatele&amp;m určenou ikonu</translation>
+        <translation>Použít svou vlastní ikonu</translation>
     </message>
     <message>
         <source>Add custom icon</source>
-        <translation>Přidat uživatelem určenou ikonu</translation>
+        <translation>Přidat svou vlastní ikonu</translation>
     </message>
     <message>
         <source>Delete custom icon</source>
-        <translation>Smazat uživatelem určenou ikonu</translation>
+        <translation>Smazat svou vlastní ikonu</translation>
     </message>
     <message>
         <source>Download favicon</source>
@@ -1693,10 +2178,6 @@ Přejete si je sloučit?</translation>
         <translation>Ikonu webu (favicon) se nedaří stáhnout.</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Rada: Jako náhradní řešení můžete zapnout Google v Nástroje → Nastavení → Zabezpečení</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>Obrázky</translation>
     </message>
@@ -1705,24 +2186,44 @@ Přejete si je sloučit?</translation>
         <translation>Veškeré soubory</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Vyberte obrázek</translation>
+        <source>Custom icon already exists</source>
+        <translation>Tato vlastní ikona už existuje</translation>
     </message>
     <message>
-        <source>Can&apos;t read icon</source>
-        <translation>Ikonu se nedaří načíst</translation>
+        <source>Confirm Delete</source>
+        <translation>Potvrdit smazání</translation>
     </message>
     <message>
-        <source>Custom icon already exists</source>
-        <translation>Tato uživatelem určená ikona už existuje</translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation>Uživatelsky určená ikona úspěšně stažena</translation>
     </message>
     <message>
-        <source>Confirm Delete</source>
-        <translation>Potvrdit smazání</translation>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>Rada: Jako náhradní řešení můžete zapnout DuckDuckGo v Nástroje → Nastavení → Zabezpečení</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>Tato ikona je používána %1 záznamy a bude nahrazena výchozí ikonou. Opravdu ji chcete smazat?</translation>
+        <source>Select Image(s)</source>
+        <translation>Vyberte obrázky</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation><numerusform>Úspěšně načtena %1 z %n ikon</numerusform><numerusform>Úspěšně načteny %1 z %n ikon</numerusform><numerusform>Úspěšně načteno %1 z %n ikon</numerusform><numerusform>Úspěšně načteny %1 z %n ikon</numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation>Nebyly načteny žádné ikony</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation><numerusform>%n ikona už v databázi existuje</numerusform><numerusform>%n ikony už v databázi existují</numerusform><numerusform>%n ikon už v databázi existuje</numerusform><numerusform>%n ikony už v databázi existují</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation><numerusform>Následující ikona se nezdařila:</numerusform><numerusform>Následující ikony se nezdařily:</numerusform><numerusform>Následující ikony se nezdařily:</numerusform><numerusform>Následující ikony se nezdařily:</numerusform></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>Tato ikona je používána %n záznamem a bude nahrazena výchozí ikonou. Opravdu ji chcete smazat?</numerusform><numerusform>Tato ikona je používána %n záznamy a bude nahrazena výchozí ikonou. Opravdu ji chcete smazat?</numerusform><numerusform>Tato ikona je používána %n záznamy a bude nahrazena výchozí ikonou. Opravdu ji chcete smazat?</numerusform><numerusform>Tato ikona je používána %n záznamy a bude nahrazena výchozí ikonou. Opravdu ji chcete smazat?</numerusform></translation>
     </message>
 </context>
 <context>
@@ -1741,7 +2242,7 @@ Přejete si je sloučit?</translation>
     </message>
     <message>
         <source>Uuid:</source>
-        <translation>Nikde se neopakující se identifikátor:</translation>
+        <translation>Univerzálně jedinečný identifikátor:</translation>
     </message>
     <message>
         <source>Plugin Data</source>
@@ -1773,9 +2274,8 @@ Dotčený zásuvný modul to může rozbít.</translation>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation>- klon</translation>
+        <source>%1 - Clone</source>
+        <translation>%1 – klon</translation>
     </message>
 </context>
 <context>
@@ -1820,10 +2320,6 @@ Dotčený zásuvný modul to může rozbít.</translation>
         <translation><numerusform>Opravdu chcete odebrat %n přílohu?</numerusform><numerusform>Opravdu chcete odebrat %n přílohy?</numerusform><numerusform>Opravdu chcete odebrat %n příloh?</numerusform><numerusform>Opravdu chcete odebrat %n příloh?</numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Potvrdit odebrání</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>Uložit přílohy</translation>
     </message>
@@ -1860,10 +2356,13 @@ Dotčený zásuvný modul to může rozbít.</translation>
 %1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation>Potvrdit odebrání</translation>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>Nedaří se otevřít soubory:
-%1</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1947,6 +2446,106 @@ Dotčený zásuvný modul to může rozbít.</translation>
         <source>Attachments</source>
         <translation>Přílohy</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>Ano</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>Vytvořit token na času založeného jednorázového hesla (TOTP)</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Zavřít</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Obecné</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Uživatelské jméno</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Heslo</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Skončení platnosti</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL adresa</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>Atributy</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Přílohy</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Poznámky</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Automatické vyplnění</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Okno</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Posloupnost</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Hledání</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Hledat</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Vyčistit</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Nikdy</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[CHRÁNĚNO]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Zapnuto</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Vypnuto</translation>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EntryView</name>
@@ -1985,6 +2584,19 @@ Dotčený zásuvný modul to může rozbít.</translation>
         <source>Recycle Bin</source>
         <translation>Koš</translation>
     </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation>[prázdné]</translation>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>HostInstaller</name>
@@ -1998,61 +2610,6 @@ Dotčený zásuvný modul to může rozbít.</translation>
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>Délka:</translation>
-    </message>
-    <message>
-        <source>Character Types</source>
-        <translation>Typy znaků</translation>
-    </message>
-    <message>
-        <source>Upper Case Letters</source>
-        <translation>Velká písmena</translation>
-    </message>
-    <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
-    </message>
-    <message>
-        <source>Lower Case Letters</source>
-        <translation>Malá písmena</translation>
-    </message>
-    <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
-    </message>
-    <message>
-        <source>Numbers</source>
-        <translation>Číslice</translation>
-    </message>
-    <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
-    </message>
-    <message>
-        <source>Special Characters</source>
-        <translation>Zvláštní znaky</translation>
-    </message>
-    <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; …</translation>
-    </message>
-    <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Vynechat podobně vypadající znaky (předejití záměně)</translation>
-    </message>
-    <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>Zajistit aby heslo obsahovalo znaky ze všech zvolených skupin znaků</translation>
-    </message>
-    <message>
-        <source>Extended ASCII</source>
-        <translation>Rozšířené ASCII</translation>
-    </message>
-</context>
-<context>
     <name>KMessageWidget</name>
     <message>
         <source>&amp;Close</source>
@@ -2060,7 +2617,7 @@ Dotčený zásuvný modul to může rozbít.</translation>
     </message>
     <message>
         <source>Close message</source>
-        <translation>Zavřít zprávu</translation>
+        <translation>Uzavřít správu</translation>
     </message>
 </context>
 <context>
@@ -2077,6 +2634,26 @@ Dotčený zásuvný modul to může rozbít.</translation>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Byl zadán nesprávný klíč, nebo je soubor s databází poškozený.</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation>chybí databázové hlavičky</translation>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation>Hlavička neodpovídá otisku</translation>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>Neplatná velikost identifikátoru hlavičky</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>Neplatná délka kolonky hlavičky</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>Neplatné délka dat hlavičky</translation>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2236,10 +2813,6 @@ Dotčený zásuvný modul to může rozbít.</translation>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation>Neplatná délka neopakujícího se identifikátoru šifry</translation>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation>Nepodporovaná šifra</translation>
     </message>
@@ -2293,6 +2866,18 @@ Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otev�
         <source>Unsupported KeePass 2 database version.</source>
         <translation>Nepodporovaná verze databáze KeePass 2.</translation>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation>Neplatná délka nikde se neopakujícího identifikátoru šifry: %1 (length=%2)</translation>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation>UUID se nedaří zpracovat: %1</translation>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2365,10 +2950,6 @@ Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otev�
         <translation>Prvek historie s rozdílným neopakujícím se identifikátorem</translation>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation>Nedaří se rozšifrovat řetězec položky</translation>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation>Zjištěn duplicitní uživatelem určený atribut</translation>
     </message>
@@ -2417,6 +2998,14 @@ Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otev�
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation>Nedaří se rozbalit binární soubor</translation>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation>Chyba XML:
+%1
+Řádek %2, sloupec %3</translation>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2437,7 +3026,7 @@ Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otev�
     </message>
     <message>
         <source>Not a KeePass database.</source>
-        <translation>Nejedná se o databázi KeePass.</translation>
+        <translation>Nejedná se o databázi Keepass.</translation>
     </message>
     <message>
         <source>Unsupported encryption algorithm.</source>
@@ -2445,7 +3034,7 @@ Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otev�
     </message>
     <message>
         <source>Unsupported KeePass database version.</source>
-        <translation>Nepodporovaná verze KeePass databáze.</translation>
+        <translation>Nepodporovaná verze databáze KeePass.</translation>
     </message>
     <message>
         <source>Unable to read encryption IV</source>
@@ -2482,11 +3071,11 @@ Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otev�
     </message>
     <message>
         <source>Unable to calculate master key</source>
-        <translation>Nedaří se vypočítat hlavní klíč</translation>
+        <translation>Nedaří se spočítat hlavní klíč</translation>
     </message>
     <message>
         <source>Wrong key or database file is corrupt.</source>
-        <translation>Byl zadán nesprávný klíč, nebo je soubor s databází poškozený.</translation>
+        <translation>Byl zadán chybný klíč, nebo je poškozen databázový soubor.</translation>
     </message>
     <message>
         <source>Key transformation failed</source>
@@ -2580,28 +3169,129 @@ Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otev�
         <source>Invalid entry field type</source>
         <translation>Neplatný typ kolonky položky</translation>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation>nedaří se posunout na pozici obsahu</translation>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>Existující uzamykací soubor, zajišťující spuštění pouze jedné instance, není platný. Spouští se nová instance.</translation>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>Soubor se zámkem se nepodařilo vytvořit. Režim jediné instance proto vypnut.</translation>
+        <source>Import from</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Už je spuštěná jiná instance KeePassXC.</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Při zkoušení šifrovacích funkcí byl zjištěn fatální nedostatek.</translation>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
+    <message>
+        <source>Key Component</source>
+        <translation>Součást klíče</translation>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC – chyba</translation>
+        <source>Key Component Description</source>
+        <translation>Popis součásti klíče</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Zrušit</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation> Součást klíče nastavena, kliknutím změníte nebo odeberete</translation>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation>Přidat %1</translation>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation>Změnit %1</translation>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation>Odebrat %1</translation>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation>%1 nastaveno, kliknutím změníte nebo odeberete</translation>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>Procházet</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Tvoř</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation>Soubor s klíčem</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;Jako další úroveň zabezpečení je možné přidat soubor s klíčem obsahujícím náhodné bajty.&lt;/p&gt;&lt;p&gt;Je třeba ho uchovávat v bezpečí a nikdy ho neztratit, jinak budete uzamčeni!&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation>Starý formát souboru s klíčem</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>Používáte starý formát souboru s klíčem, který v budoucnu nemusí být podporován.
+
+Jděte do nastavení hlavního klíče a vytvořte nový soubor s klíčem.</translation>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation>Chyba načítání souboru s klíčem „%1“
+Zpráva: %2</translation>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Soubory s klíči</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Veškeré soubory</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Vytvořit soubor s klíčem…</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation>Chyba při vytváření souboru s klíčem</translation>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation>Nedaří se vytvořit soubor s klíčem: %1</translation>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Vyberte soubor s klíčem</translation>
     </message>
 </context>
 <context>
@@ -2615,28 +3305,16 @@ Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otev�
         <translation>&amp;Nedávno otevřené databáze</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Importovat</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
-        <translation>&amp;Nápověda</translation>
+        <translation>Nápověda</translation>
     </message>
     <message>
         <source>E&amp;ntries</source>
         <translation>Záz&amp;namy</translation>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>Zkopí&amp;rovat atribut do schránky</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation>Na času založené jednorázové heslo</translation>
-    </message>
-    <message>
         <source>&amp;Groups</source>
-        <translation>S&amp;kupiny</translation>
+        <translation>Skupiny</translation>
     </message>
     <message>
         <source>&amp;Tools</source>
@@ -2644,7 +3322,7 @@ Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otev�
     </message>
     <message>
         <source>&amp;Quit</source>
-        <translation>&amp;Ukončit</translation>
+        <translation>Ukončit</translation>
     </message>
     <message>
         <source>&amp;About</source>
@@ -2656,67 +3334,35 @@ Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otev�
     </message>
     <message>
         <source>&amp;Save database</source>
-        <translation>&amp;Uložit databázi</translation>
+        <translation>Uložit databázi</translation>
     </message>
     <message>
         <source>&amp;Close database</source>
-        <translation>&amp;Zavřít databázi</translation>
-    </message>
-    <message>
-        <source>&amp;New database</source>
-        <translation>&amp;Nová databáze</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>Sloučit z databáze KeePassX</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>Přid&amp;at nový záznam</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>Zobrazit/Upra&amp;vit záznam</translation>
+        <translation>Zavřít databázi</translation>
     </message>
     <message>
         <source>&amp;Delete entry</source>
-        <translation>&amp;Smazat záznam</translation>
-    </message>
-    <message>
-        <source>&amp;Add new group</source>
-        <translation>Přid&amp;at novou skupinu</translation>
+        <translation>Smazat záznam</translation>
     </message>
     <message>
         <source>&amp;Edit group</source>
-        <translation>&amp;Upravit skupinu</translation>
+        <translation>Upravit skupinu</translation>
     </message>
     <message>
         <source>&amp;Delete group</source>
-        <translation>&amp;Smazat skupinu</translation>
+        <translation>Smazat skupinu</translation>
     </message>
     <message>
         <source>Sa&amp;ve database as...</source>
         <translation>&amp;Uložit databázi jako…</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Z&amp;měnit hlavní klíč…</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>Nastavení &amp;databáze</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>Nastavení databáze</translation>
     </message>
     <message>
         <source>&amp;Clone entry</source>
-        <translation>&amp;Klonovat záznam</translation>
-    </message>
-    <message>
-        <source>&amp;Find</source>
-        <translation>&amp;Najít</translation>
+        <translation>Klonovat záznam</translation>
     </message>
     <message>
         <source>Copy &amp;username</source>
@@ -2727,10 +3373,6 @@ Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otev�
         <translation>Zkopírovat uživatelské jméno do schránky</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>&amp;Zkopírovat heslo</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>Zkopírovat heslo do schránky</translation>
     </message>
@@ -2740,19 +3382,11 @@ Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otev�
     </message>
     <message>
         <source>Password Generator</source>
-        <translation>Vytváření hesel</translation>
-    </message>
-    <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation>&amp;Provést automatické vyplnění</translation>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>&amp;Otevřít URL adresu</translation>
+        <translation>Generátor hesel</translation>
     </message>
     <message>
         <source>&amp;Lock databases</source>
-        <translation>&amp;Uzamknout databáze</translation>
+        <translation>Uzamknout databáze</translation>
     </message>
     <message>
         <source>&amp;Title</source>
@@ -2783,28 +3417,12 @@ Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otev�
         <translation>&amp;Exportovat do CSV souboru…</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Importovat databázi aplikace KeePass verze 1…</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>Importovat CSV soubor…</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>O&amp;pravit databázi…</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>Zobrazit na času založené jednorázové heslo (TOTP)</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
-        <translation>Nastavit na času založené jednorázové heslo (TOTP)…</translation>
+        <translation>Nastavit TOTP…</translation>
     </message>
     <message>
         <source>Copy &amp;TOTP</source>
-        <translation>Zkopírovat na času založené jednorázové heslo (&amp;TOTP)</translation>
+        <translation>Zkopírovat &amp;TOTP</translation>
     </message>
     <message>
         <source>E&amp;mpty recycle bin</source>
@@ -2819,14 +3437,6 @@ Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otev�
         <translation>Chyba přístupu k souboru s nastaveními %1</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Zdá se, že pro napojení prohlížeče používáte KeePassHTTP. Tato funkce byla označena za zastaralou a bude v budoucnu odebrána.&lt;br&gt;Přejděte na KeePassXC-Browser! S přechodem pomůže &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migrační příručka&lt;/a&gt; (varování %1 ze 3).&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>pouze pro čtení</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Nastavení</translation>
     </message>
@@ -2839,36 +3449,278 @@ Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otev�
         <translation>Ukončit KeePassXC</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Databáze ve formátu KeePass 2</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Dotkněte se tlačítka na svém YubiKey zařízení!</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Veškeré soubory</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation>VAROVÁNÍ: Používáte vývojové sestavení KeePassXC!
+Je zde vysoké riziko poškození dat, proto udržujte zálohu svých databází.
+Tato verze není určena pro produkční použití.</translation>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Otevřít databázi</translation>
+        <source>&amp;Donate</source>
+        <translation>&amp;Darovat</translation>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Uložit opravenou databázi</translation>
+        <source>Report a &amp;bug</source>
+        <translation>Nahlásit chy&amp;bu</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Zápis do databáze se nezdařil.</translation>
+        <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>VAROVÁNÍ: Vámi používaná verze Qt může způsobovat, že při použití klávesnice na obrazovce KeePassXC zhavaruje!
+Doporučujeme použít AppImage, které je k dispozici v sekci stahování našich stránek.</translation>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Dotkněte se tlačítka na svém YubiKey zařízení!</translation>
+        <source>&amp;Import</source>
+        <translation>&amp;Importovat</translation>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
-        <translation>VAROVÁNÍ: Používáte vývojové sestavení KeePassXC!
-Je zde vysoké riziko poškození dat, proto udržujte zálohu svých databází.
-Tato verze není určena pro produkční použití.</translation>
+        <source>Copy att&amp;ribute...</source>
+        <translation>Zkopírovat at&amp;ribut…</translation>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation>TOTP…</translation>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation>&amp;Nová databáze…</translation>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation>Vytvořit novou databázi</translation>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation>&amp;Sloučit z databáze…</translation>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation>Sloučit z jiné KDBX databáze</translation>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation>&amp;Nový záznam</translation>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation>Přidat nový záznam</translation>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation>&amp;Upravit záznam</translation>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation>Zobrazit nebo upravit položku</translation>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation>&amp;Nová skupina</translation>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation>Přidat novou skupinu</translation>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation>Změnit hlavní &amp;klíč…</translation>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation>Nastavení &amp;databáze…</translation>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation>Zko&amp;pírovat heslo</translation>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation>Provést &amp;automatické vyplnění</translation>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation>Otevřít &amp;URL adresu</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation>Databáze ve formátu KeePass verze 1…</translation>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation>Importovat databázi aplikace KeePass verze 1</translation>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation>CSV soubor…</translation>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation>Importovat CSV soubor</translation>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation>Zobrazit na času založené jednorázové heslo (TOTP)…</translation>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation>Zobrazit QR kód s TOTP…</translation>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation>Vytváření chybějícího %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation>Přemisťování %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation>Přepisování %1 [%2]</translation>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation>starší položka sloučena z databáze „%1“</translation>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation>Přidávání zálohy pro starší cíl %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation>Přidávání zálohy pro starší zdroj %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation>Znovu se uplatňují původní zdrojové položky nad novějším zdrojem %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation>Znovu se uplatňují původní zdrojové položky nad novějším cílem %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation>Synchronizace z novějšího zdroje %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation>Synchronizace ze staršího zdroje %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation>Mazání podřízeného %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation>Mazání osiřelého %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation>Změněny smazané objekty</translation>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation>Přidávání chybějící ikony %1</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation>Vytvořit novou KeePassXC databázi…</translation>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Kořen</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>Stránka průvodce</translation>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation>&amp;Nastavení šifrování</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>Zde je možné přizpůsobit nastavení šifrování databáze. Nemějte obavy, kdykoli je možné je později změnit v nastavení databáze.</translation>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Pokročilá nastavení</translation>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation>Základní nastavení</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <translation>Nastavení šifrování</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>Zde je možné přizpůsobit nastavení šifrování databáze. Nemějte obavy, kdykoli je možné je později změnit v nastavení databáze.</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation>Hlavní klíč do databáze</translation>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation>Hlavní klíč, známý pouze vám, pro ochranu vaší databáze.</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <translation>Obecné informace o databázi</translation>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation>Vyplňte zobrazovaný název a volitelný popis nové databáze:</translation>
     </message>
 </context>
 <context>
@@ -2971,125 +3823,34 @@ Tato verze není určena pro produkční použití.</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>Toto je vyžadováno pro přístup k databázím z ChromeIPass nebo PassIFox</translation>
-    </message>
-    <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>Zapnout KeePassHTTP server</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Obecné</translation>
-    </message>
-    <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>Z&amp;obrazit oznámení když jsou požadovány přihlašovací údaje</translation>
-    </message>
-    <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>Odpoví pouze nejlepšími shodami pro konkrétní URL adresu namísto všech položek pro celou doménu.</translation>
-    </message>
-    <message>
-        <source>&amp;Return only best matching entries</source>
-        <translation>Odpovídat pouze nejlépe se shodujícími položkami</translation>
-    </message>
-    <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>&amp;Vyžádat odemknutí zamčené databáze</translation>
-    </message>
-    <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation>Je odpovězeno pouze položkami se stejným schématem (http://, https://, ftp://, …).</translation>
-    </message>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>&amp;Match URL schemes</source>
-        <translation>&amp;Hledat shodu s URL schématy</translation>
-    </message>
-    <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Seřadit odpovídající záznamy dle &amp;uživatelského jména</translation>
-    </message>
-    <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Seřadit odpovídající zázna&amp;my dle názvu</translation>
-    </message>
-    <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>Z právě otevřené databáze od&amp;ebrat veškeré sdílené šifrovací klíče</translation>
-    </message>
-    <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>Z právě otevřené databáze odebrat veškerá uložená oprávnění</translation>
-    </message>
-    <message>
-        <source>Password Generator</source>
-        <translation>Vytváření hesel</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Pokročilé</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Vždy umožnit přístup k zázn&amp;amům</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Vždy umožnit akt&amp;ualizovat záznamy</translation>
-    </message>
-    <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>Pouze označené databáze je třeba spojit s klientem.</translation>
-    </message>
-    <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Vy&amp;hledat odpovídající záznamy ve všech otevřených databázích</translation>
-    </message>
-    <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>Automatické vytváření nebo aktualizace není u textových kolonek podporované!</translation>
-    </message>
-    <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>Odpovědět také kolonkami pok&amp;ročilých textových řetězců které začínají na „KPH: “</translation>
-    </message>
-    <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP port:</translation>
+        <source>Enter password:</source>
+        <translation>Zadejte heslo:</translation>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Výchozí port: 19455</translation>
+        <source>Confirm password:</source>
+        <translation>Potvrdit heslo:</translation>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC bude očekávat spojení na tomto portu na adrese 127.0.0.1</translation>
+        <source>Password</source>
+        <translation>Heslo</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;Varování:&lt;/b&gt; Následující předvolby mohou být nebezpečné!</translation>
+        <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;Heslo je hlavní metodou zabezpečení databáze.&lt;/p&gt;&lt;p&gt;Dobrá hesla jsou dlouhá a nepoužívaná stejná na více místech. KeePassXC ho pro vás může vytvořit.&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;KeePassHTTP byl označen za zastaralý a bude v budoucnu odebrán.&lt;br&gt;Přejděte na KeePassXC-Browser! Pomoc s přechodem naleznete v &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migrační příručce&lt;/a&gt;.&lt;/p&gt;</translation>
+        <source>Password cannot be empty.</source>
+        <translation>Heslo nemůže zůstat nevyplněné.</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Není možné navázat se na privilegované porty</translation>
+        <source>Passwords do not match.</source>
+        <translation>Zadání hesla se neshodují.</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Není možné navázat na porty s číslem nižším, než 1024!
-Náhradně bude použit výchozí port 19455.</translation>
+        <source>Generate master password</source>
+        <translation>Vytvořit hlavní heslo</translation>
     </message>
 </context>
 <context>
@@ -3160,18 +3921,10 @@ Náhradně bude použit výchozí port 19455.</translation>
         <translation>Slovník:</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Počet slov:</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>Oddělovač slov:</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>Tvoř</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Kopírovat</translation>
     </message>
@@ -3184,16 +3937,12 @@ Náhradně bude použit výchozí port 19455.</translation>
         <translation>Zavřít</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>Použít</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>Nahodilost: %1 bitů</translation>
     </message>
     <message>
         <source>Password Quality: %1</source>
-        <translation>Odolnost hesla: %1</translation>
+        <translation>Kvalita hesla: %1</translation>
     </message>
     <message>
         <source>Poor</source>
@@ -3215,6 +3964,171 @@ Náhradně bude použit výchozí port 19455.</translation>
         <comment>Password quality</comment>
         <translation>Výborná</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation>RozšířenéASCII</translation>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation>Přepnout do pokročilého režimu</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Pokročilé</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation>Velká písmena od A do F</translation>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation>Malá písmena od A do F</translation>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation>Složené závorky</translation>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation>{[(</translation>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation>Interpunkční znaménka</translation>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation>.,:;</translation>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation>Uvozovky</translation>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation>&quot; &apos;</translation>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation>Matematické</translation>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation>&lt;*+!?=</translation>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation>Pomlčky</translation>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation>\_|-/</translation>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation>Logogramy</translation>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation>#$%&amp;&amp;@^`~</translation>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation>Přepnout do zjednodušeného režimu</translation>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation>Jednoduchý</translation>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation>Sada znaků kterou z vytvářených hesel vynechat</translation>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation>Nezahrnovat:</translation>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation>Přidat nehexadecimální znaky do seznamu „nezahrnovat“</translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation>Hex</translation>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation>Vynechané znaky: „0“, „1“, „l“, „I“, „O“, „|“, „ . “</translation>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation>&amp;Počet slov:</translation>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation>Regenerovat</translation>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Smazat</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Odebrat</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Vypnout</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3235,34 +4149,18 @@ Náhradně bude použit výchozí port 19455.</translation>
         <translation>Zprávu se nedaří rozšifrovat</translation>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
-        <translation>Překročení časového limitu nebo se nedaří spojit s KeePassXC</translation>
-    </message>
-    <message>
         <source>Action cancelled or denied</source>
         <translation>Akce zrušena nebo odepřena</translation>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation>Zprávu se nedaří zašifrovat nebo nebyla nalezena veřejná část klíče. Je v KeePassXC zapnuté posílání zpráv mezi webovým prohlížečem a desktopovou aplikací (native messaging)?</translation>
-    </message>
-    <message>
         <source>KeePassXC association failed, try again</source>
         <translation>Přiřazení KeePassXC se nezdařilo, zkuste to znovu</translation>
     </message>
     <message>
-        <source>Key change was not successful</source>
-        <translation>Výměna klíče nebyla úspěšná</translation>
-    </message>
-    <message>
         <source>Encryption key is not recognized</source>
         <translation>Šifrovací klíč nebyl rozpoznán</translation>
     </message>
     <message>
-        <source>No saved databases found</source>
-        <translation>Nebyly nalezeny žádné uložené databáze</translation>
-    </message>
-    <message>
         <source>Incorrect action</source>
         <translation>Nesprávná akce</translation>
     </message>
@@ -3388,10 +4286,6 @@ Náhradně bude použit výchozí port 19455.</translation>
         <translation>Zadejte heslo pro odemknutí %1:</translation>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation>Nepodařilo se načíst soubor s klíčem %1: %2</translation>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3468,51 +4362,21 @@ Příkazy k dispozici:
     </message>
     <message>
         <source>NULL device</source>
-        <translation>Prázdné zařízení</translation>
+        <translation>NULL zařízení</translation>
     </message>
     <message>
         <source>error reading from device</source>
         <translation>Chyba při čtení ze zařízení</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>soubor je prázdný!
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
-        <translation>chybně formovaný řetězec</translation>
+        <translation>špatně formovaný řetězec</translation>
     </message>
     <message>
         <source>missing closing quote</source>
         <translation>chybějící uzavírací uvozovka</translation>
     </message>
     <message>
-        <source>AES: 256-bit</source>
-        <translation>AES: 256-bit</translation>
-    </message>
-    <message>
-        <source>Twofish: 256-bit</source>
-        <translation>Twofish: 256-bit</translation>
-    </message>
-    <message>
-        <source>ChaCha20: 256-bit</source>
-        <translation>ChaCha20: 256-bit</translation>
-    </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – doporučeno)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 4)</source>
-        <translation>AES-KDF (KDBX 4)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 3.1)</source>
-        <translation>AES-KDF (KDBX 3.1)</translation>
-    </message>
-    <message>
         <source>Group</source>
         <translation>Skupina</translation>
     </message>
@@ -3541,12 +4405,8 @@ Příkazy k dispozici:
         <translation>Vytvořeno</translation>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
-        <translation>Starý způsob napojení webového prohlížeče</translation>
-    </message>
-    <message>
         <source>Browser Integration</source>
-        <translation>Napojení webového prohlížeče</translation>
+        <translation>Napojení na webový prohlížeč</translation>
     </message>
     <message>
         <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
@@ -3573,10 +4433,6 @@ Příkazy k dispozici:
         <translation>Počet slov pro diceware heslovou frázi.</translation>
     </message>
     <message>
-        <source>count</source>
-        <translation>počet</translation>
-    </message>
-    <message>
         <source>Wordlist for the diceware generator.
 [Default: EFF English]</source>
         <translation>Slovník pro diceware generátor.
@@ -3587,28 +4443,441 @@ Příkazy k dispozici:
         <translation>Vytvořit nové náhodné heslo.</translation>
     </message>
     <message>
-        <source>Length of the generated password.</source>
-        <translation>Délka vytvářeného hesla.</translation>
+        <source>Invalid value for password length %1.</source>
+        <translation>Neplatná hodnota pro délku hesla %1.</translation>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation>Nedaří se vytvořit položku v umístění %1.</translation>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
-        <translation>Použít ve vytvářeném heslu malá písmena.</translation>
+        <source>Enter password for new entry: </source>
+        <translation>Zadejte heslo pro novou položku:</translation>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
-        <translation>Použít ve vytvářeném heslu velká písmena.</translation>
+        <source>Writing the database failed %1.</source>
+        <translation>Zápis do databáze se nezdařil %1.</translation>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
-        <translation>Použít ve vytvářeném heslu číslice.</translation>
+        <source>Successfully added entry %1.</source>
+        <translation>Položka %1 úspěšně přidána.</translation>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
-        <translation>Použít ve vytvářeném heslu speciální znaky.</translation>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation>Zkopírovat stávající TOTP do schránky.</translation>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
-        <translation>Použít ve vytvářeném heslu rozšířené ASCII.</translation>
+        <source>Invalid timeout value %1.</source>
+        <translation>Neplatná hodnota časového limitu %1.</translation>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation>Položka %1 nenalezena.</translation>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation>Položka s umístěním %1 nemá nastavené TOTP heslo.</translation>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation>Stávající TOTP heslo položky zkopírováno do schránky!</translation>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation>Heslo položky zkopírováno do schránky!</translation>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation><numerusform>Vyčištění schránky za %1 sekundu…</numerusform><numerusform>Vyčištění schránky za %1 sekundy…</numerusform><numerusform>Vyčištění schránky za %1 sekund…</numerusform><numerusform>Vyčištění schránky za %1 sekundy…</numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation>Schránka vyčištěna!</translation>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation>Umlčet výzvy na heslo a další druhotné výstupy.</translation>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation>počet</translation>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation>Neplatná hodnota pro délku hesla: %1.</translation>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation>Položku se nedaří v umístění %1 nalézt.</translation>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation>Neprovedena změna žádného pole pro položku %1.</translation>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation>Zadejte nové heslo pro položku:</translation>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation>Zápis do databáze se nezdařil: %1</translation>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation>Položka %1 úspěšně upravena.</translation>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation>Délka %1</translation>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation>Nahodilost %1</translation>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation>Log10 %1</translation>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation>Víceslovné extra bity %1</translation>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation>Typ: hrubá síla</translation>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation>Typ: slovníkový</translation>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation>Typ: slovník+nahrazování</translation>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation>Typ: uživatelsky zadaná slova</translation>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation>Typ: uživatelský+nahrazování</translation>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation>Typ: opakování</translation>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation>Typ: posloupnost</translation>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation>Typ: prostorové</translation>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation>Typ: datum</translation>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation>Type: hrubá síla (opak.)</translation>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation>Type: slovníkový (opak.)</translation>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation>Typ: slovník+nahrazování (opak.)</translation>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation>Typ: uživatelsky zadaná slova (opak)</translation>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation>Typ: uživatelský+nahrazování (opak)</translation>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation>Typ: opakování (opak.)</translation>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation>Typ: posloupnost (opak)</translation>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation>Typ: prostorové (opak.)</translation>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation>Type: datum (opak)</translation>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation>Typ: neznámé%1</translation>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation>Nahodilost %1 (%2)</translation>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation>*** Délka hesla (%1) != součtu délky částí (%2) ***</translation>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation>Nepodařilo se načíst soubor s klíčem %1: %2</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>Soubor %1 neexistuje.</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Soubor %1 se nedaří otevřít.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation>Chyba při čtení databáze:
+%1</translation>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation>Chyba při zpracování databáze:
+%1</translation>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation>Délka vytvářeného hesla</translation>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation>Použít malá písmena</translation>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation>Použít velká písmena</translation>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation>Použít čísla.</translation>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation>Použít zvláštní znaky</translation>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation>Použít rozšířené ASCII</translation>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation>Vynechat sadu znaků</translation>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation>znaky</translation>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation>Vynechat podobně vypadající znaky (předejití záměně)</translation>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation>Zahrnout znaky ze všech zvolených skupin</translation>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation>Rekurzivně vypsat prvky skupiny.</translation>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation>Skupinu %1 se nedaří nalézt.</translation>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation>Chyba při čtení slučovaného souboru:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation>Nedaří se uložit databázi do souboru: %1</translation>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation>Nedaří se uložit databázi do souboru: %1</translation>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation>Položka %1 úspěšně přesunuta do Koše.</translation>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation>Položka %1 úspěšně smazána.</translation>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation>Zobrazit stávající TOTP heslo položky.</translation>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation>CHYBA: neznámý atribut %1.</translation>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation>Nebyl určen program pro manipulaci se schránkou</translation>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation>Nedaří se spustit program %1</translation>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation>soubor je prázdný</translation>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation>%1: (řádek, sloupec) %2,%3</translation>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256-bit</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256-bit</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256-bit</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – doporučeno)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation>Neplatná nastavení</translation>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation>Neplatný klíč</translation>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>Odebrat položku z databáze.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>Popis umístění položky k odebrání.</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>Existující uzamykací soubor, zajišťující spuštění pouze jedné instance, není platný. Spouští se nová instance.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Soubor se zámkem se nepodařilo vytvořit. Režim jediné instance proto vypnut.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC – aplikace pro správu hesel, fungující na vícero operačních systémech</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>soubory s databázemi hesel k otevření (*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>umístění vlastního souboru s nastaveními</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>soubor s klíčem k databázi</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>načíst heslo k databázi ze standardního vstupu</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation>Obecný identifikátor (handle) nadřazeného okna</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Již je spuštěná jiná instance KeePassXC.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Při zkoušení šifrovacích funkcí byl zjištěn fatální nedostatek.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC – chyba</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation>Heslo databáze:</translation>
     </message>
 </context>
 <context>
@@ -3638,7 +4907,7 @@ Příkazy k dispozici:
     <name>QtIOCompressor::open</name>
     <message>
         <source>The gzip format not supported in this version of zlib.</source>
-        <translation>Formát komprese gzip není podporován verzí knihovny zlib, která je právě používána na tomto systému.</translation>
+        <translation>Použitý formát gzip komprese není podporován verzí knihovny zlib, která je právě používána na tomto systému.</translation>
     </message>
     <message>
         <source>Internal zlib error: </source>
@@ -3646,12 +4915,98 @@ Příkazy k dispozici:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
+    <message>
+        <source>Agent connection failed.</source>
+        <translation>Připojení k agentovi se nezdařilo.</translation>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation>Chyba protokolu agenta.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation>Není spuštěný žádný agent, identitu nelze přidat.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation>Není spuštěný žádný agent, identitu není možné odebrat.</translation>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation>Agent tuto identitu odmítl. Mezi možné důvody patří:</translation>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation>Klíč už byl přidán.</translation>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation>Omezená životnost není podporována agentem (zkontrolujte volby).</translation>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation>Požadavek na potvrzení není podporován agentem (zkontrolujte volby).</translation>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation>Nápověda ke hledání</translation>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation>Pojmy hledejte následovně: [modifikátory][kolonka:][&quot;]pojem[&quot;]</translation>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation>Je třeba shody v každém hledaném termínu (tj, logické A)</translation>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation>Modifikátory</translation>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation>vynechat pojem z výsledků</translation>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation>hledat přesnou shodu s pojmem</translation>
+    </message>
     <message>
-        <source>Search...</source>
-        <translation>Hledat…</translation>
+        <source>use regex in term</source>
+        <translation>použít v pojmu regulární výraz</translation>
     </message>
     <message>
+        <source>Fields</source>
+        <translation>Kolonky</translation>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation>Zástupné znaky pojmu</translation>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation>shoda s čímkoli</translation>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation>shoda s jedním</translation>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation>logické NEBO</translation>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation>Příklady</translation>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
         <source>Search</source>
         <translation>Hledat</translation>
     </message>
@@ -3660,314 +5015,316 @@ Příkazy k dispozici:
         <translation>Vyčistit</translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Rozlišovat velikost písmen</translation>
-    </message>
-    <message>
         <source>Limit search to selected group</source>
         <translation>Omezit hledání na označenou skupinu</translation>
     </message>
+    <message>
+        <source>Search Help</source>
+        <translation>Nápověda ke hledání</translation>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation>Hledat (%1)…</translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation>Rozlišovat malá/velká písmena</translation>
+    </message>
 </context>
 <context>
-    <name>Service</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC: nový požadavek na přiřazení klíče</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation>Obdrželi jste požadavek na přiřazení výše uvedeného klíče.
-Pokud jím chcete umožnit přístup do KeePassXC databáze, zadejte pro něj
-neopakující se název pro identifikaci a potvrďte ho.</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: Přepsat stávající klíč?</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Už existuje sdílený šifrovací klíč s názvem „%1“.
-Chcete ho chcete přepsat?</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: Aktualizovat záznam</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Chcete aktualizovat údaj v %1 – %2?</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Databáze uzamčena!</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Právě otevřená databáze je uzamčená!
-Buď jí odemkněte, nebo vyberte jinou, odemčenou.</translation>
+        <source>Key:</source>
+        <translation>Klíč:</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Klíče odebrány z databáze</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation><numerusform>Úspěšně odebrán %n šifrovací klíč z nastavení KeePassX/Http.</numerusform><numerusform>Úspěšně odebrány %n šifrovací klíče z nastavení KeePassX/Http.</numerusform><numerusform>Úspěšně odebráno %n šifrovacích klíčů z nastavení KeePassX/Http.</numerusform><numerusform>Úspěšně odebráno %n šifrovacích klíčů z nastavení KeePassX/Http.</numerusform></translation>
+        <source>Generate</source>
+        <translation>Tvoř</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Nebyly nalezeny žádné klíče</translation>
+        <source>Import</source>
+        <translation>Importovat</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>V nastavení KeePassHttp nebyly nalezeny žádné sdílené šifrovací klíče.</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Nastavení nejsou k dispozici!</translation>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>Právě otevřená databáze neobsahuje žádný záznam nastavení pro KeePassHttp.</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>Odstraňování uložených oprávnění…</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>Přerušit</translation>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Odebraná oprávnění</translation>
+        <source>Remove</source>
+        <translation>Odebrat</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation><numerusform>Úspěšně odebrána oprávnění z %n položky.</numerusform><numerusform>Úspěšně odebrána oprávnění ze %n položek.</numerusform><numerusform>Úspěšně odebrána oprávnění z %n položek.</numerusform><numerusform>Úspěšně odebrána oprávnění z %n položek.</numerusform></translation>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Nebyl nalezen žádný záznam s oprávněními!</translation>
+        <source>Status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Právě otevřená databáze neobsahuje záznam s oprávněními.</translation>
+        <source>Fingerprint</source>
+        <translation>Otisk</translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
-        <translation>Nastavení aplikace</translation>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Obecné</translation>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>Zabezpečení</translation>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>Chyba přístupu k souboru s nastaveními %1</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>Základní nastavení</translation>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Spouštět pouze jedinou instanci KeePassXC</translation>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>Pamatovat si nedávno otevřené databáze</translation>
+        <source>All files</source>
+        <translation>Veškeré soubory</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Pamatovat si minule použité soubory s klíči a zabezpečovací klíčenky</translation>
+        <source>Select path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Při spouštění aplikace načíst minule otevřené databáze</translation>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>Před ukončením aplikace automaticky uložit případné změny</translation>
+        <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"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>Po každé změně hned automaticky uložit</translation>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>V případě úpravy zvenčí, automaticky znovu načíst databázi</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>Po zkopírování údaje do schránky odklidit okno aplikace jeho automatickou minimalizací</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Spouštět aplikaci s minimalizovaným oknem</translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>Pro vytvářený záznam použít ikonu skupiny, pod kterou je vytvářen</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Neoznačovat databázi jako upravenou při změnách, nepostihujících údaje (např. rozkliknutí skupin)</translation>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
-        <translation>Skrýt podrobný pohled</translation>
+        <source>Never</source>
+        <translation>Nikdy</translation>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>Zobrazovat ikonu v oznamovací oblasti systémového panelu</translation>
+        <source>Always</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>Minimalizovat okno aplikace do oznamovací oblasti systémového panelu</translation>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
-        <translation>Namísto ukončení aplikace skrýt její okno do oznamovací oblasti systémového panelu</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
-        <translation>Tmavá ikona v oznamovací oblasti systémového panelu</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Jazyk</translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Automatické vyplňování</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>Použít titulek položky pro hledání shody s okny pro všeobecné automatické vyplňování</translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>Použít URL adresu položky pro hledání shody s okny pro všeobecné automatické vyplňování</translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation>Vždy se zeptat před provedením automatického vyplnění</translation>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Klávesová zkratka pro všeobecné automatické vyplňování</translation>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>Prodleva automatického vyplnění</translation>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation> ms</translation>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
-        <translation>Spouštění</translation>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
-        <translation>Správa souboru</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation>Ukládat databázové soubory bezpečně (může být neslučitelné s Dropbox, atd.)</translation>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
-        <translation>Před uložením zazálohovat databázový soubor</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
-        <translation>Správa záznamu</translation>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Obecné</translation>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
-        <translation>Časové limity</translation>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>Vymazat obsah schránky po uplynutí</translation>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>sek.</translation>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>Uzamknout databázi při nečinnosti delší než</translation>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Pohodlí</translation>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Zamknout databáze když je zamčeno sezení uživatele v operačním systému nebo je zavřeno víko notebooku</translation>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>Při minimalizaci okna uzamknout databáze</translation>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>TotpDialog</name>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>Pokud je viditelné, nevyžadovat zopakování zadání hesla</translation>
+        <source>Timed Password</source>
+        <translation>Časované heslo</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Hesla vždy viditelná (nezakrývat hvězdičkami)</translation>
+        <source>000000</source>
+        <translation>000000</translation>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
-        <translation>Skrýt hesla v náhledovém panelu</translation>
+        <source>Copy</source>
+        <translation>Kopírovat</translation>
+    </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation><numerusform>Platnost končí za &lt;b&gt;%n&lt;/b&gt; sekundu</numerusform><numerusform>Platnost končí za %n sekundy</numerusform><numerusform>Platnost končí za %n sekund</numerusform><numerusform>Platnost končí za %n sekundy</numerusform></translation>
     </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
     <message>
-        <source>Hide entry notes by default</source>
-        <translation>Skrývat ve výchozím stavu poznámky k položkám</translation>
+        <source>Copy</source>
+        <translation>Kopírovat</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>Soukromí</translation>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation>POZN.: Tato TOTP nastavení jsou uživatelská a nemusí fungovat s ostatními ověřovači.</translation>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>Použít Google jako náhradní zdroj pro stahování ikon webů</translation>
+        <source>There was an error creating the QR code.</source>
+        <translation>Došlo k chybě při vytváření QR kódu.</translation>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
-        <translation>Po provedení automatického vyplnění opět zamknout dříve uzamčenou databázi.</translation>
+        <source>Closing in %1 seconds.</source>
+        <translation>Zavření za %1 sekund.</translation>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation>Nastavit na času založené jednorázové heslo (TOTP)</translation>
@@ -3989,59 +5346,84 @@ Buď jí odemkněte, nebo vyberte jinou, odemčenou.</translation>
         <translation>Použít vlastní nastavení</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>Pozn.: Tato nastavení měňte pouze pokud víte co děláte.</translation>
+        <source>Custom Settings</source>
+        <translation>Uživatelsky určená nastavení</translation>
     </message>
     <message>
         <source>Time step:</source>
         <translation>Časový krok:</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8 číslic</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>sek.</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>Velikost kódu:</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6 číslic</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>Velikost kódu:</translation>
+        <source>7 digits</source>
+        <translation>7 číslic</translation>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>sek.</translation>
+        <source>8 digits</source>
+        <translation>8 číslic</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>Časované heslo</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Kopírovat</translation>
+        <source>Close</source>
+        <translation>Zavřít</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>Platnost skončí za</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>sekund</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>Odemknout databázi</translation>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4076,42 +5458,26 @@ Buď jí odemkněte, nebo vyberte jinou, odemčenou.</translation>
     </message>
 </context>
 <context>
-    <name>main</name>
-    <message>
-        <source>Remove an entry from the database.</source>
-        <translation>Odebrat položku z databáze.</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>Umístění databáze.</translation>
-    </message>
-    <message>
-        <source>Path of the entry to remove.</source>
-        <translation>Popis umístění položky k odebrání.</translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC – aplikace pro správu hesel, fungující na vícero operačních systémech</translation>
-    </message>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>soubory s databázemi hesel k otevření (*.kdbx)</translation>
+        <source>Refresh</source>
+        <translation>Načíst znovu</translation>
     </message>
     <message>
-        <source>path to a custom config file</source>
-        <translation>umístění uživatelem určeného souboru s nastaveními</translation>
+        <source>YubiKey Challenge-Response</source>
+        <translation>YubiKey výzva-odpověď</translation>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>soubor s klíčem k databázi</translation>
+        <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>&lt;p&gt;Pokud vlastníte zařízení &lt;a href=&quot;https://www.yubico.com/&quot;&gt;YubiKey&lt;/a&gt;, můžete ho použít jako další úroveň zabezpečení.&lt;/p&gt;&lt;p&gt;YubiKey  vyžaduje aby jeden z jeho slotů byl naprogramován jako &lt;a href=&quot;https://www.yubico.com/products/services-software/personalization-tools/challenge-response/&quot;&gt;HMAC-SHA1 výzva-odpověď&lt;/a&gt;.&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>načíst heslo k databázi ze standardního vstupu</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation>Nezjištěno žádné YubiKey zařízení – ověřte, že je připojené.</translation>
     </message>
     <message>
-        <source>Parent window handle</source>
-        <translation>Obecný identifikátor (handle) nadřazeného okna</translation>
+        <source>No YubiKey inserted.</source>
+        <translation>Není připojeno žádné Yubikey zařízení.</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_da.ts b/share/translations/keepassx_da.ts
index 61e0cac87..af8604cca 100644
--- a/share/translations/keepassx_da.ts
+++ b/share/translations/keepassx_da.ts
@@ -38,12 +38,6 @@
         <translation>Kopier til udklipsholder</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>Version %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>Revision: %1</translation>
     </message>
@@ -76,35 +70,48 @@ Kerne: %3 %4</translation>
         <translation>Særlig tak fra KeePassXC holdet går til debfx for at udvikle den oprindelige KeePassX.</translation>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
-        <translation>Opret type:%1
-</translation>
+        <source>Version %1</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP Bekræft Adgang</translation>
+        <source>Build Type: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>Husk dette valg</translation>
+        <source>Auto-Type</source>
+        <translation>Auto-Indsæt</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Tillad</translation>
+        <source>Browser Integration</source>
+        <translation>Browser-integration</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>Afvis</translation>
+        <source>SSH Agent</source>
+        <translation>SSH Agent</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>%1 har forespurgt adgang til kodeord tilhørende disse element(er).
-Vælg venligst hvorvidt du vil tillade denne adgang.</translation>
+        <source>YubiKey</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -113,6 +120,277 @@ Vælg venligst hvorvidt du vil tillade denne adgang.</translation>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>Slå SSH Agenten til (kræver genstart)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Programindstillinger</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Generelt</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Sikkerhed</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Adgangsfejl for konfigurationsfil %1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Grundlæggende indstillinnger</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>Opstart</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Start kun en enkelt instans af KeePassXC</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Husk seneste databaser</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Husk de sidste nøglefiler og sikkerhedsdongler</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Load den forrige database ved opstart</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>Minimér vindue ved opstart</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>Filhåndtering</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation>Gem databasefiler sikkert (kan være inkompatibelt med Dropbox, etc.)</translation>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation>Lav backup af databasefil før der gemmes</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Gem automatisk ved ændringer</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Gem automatisk ved afslutning</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Markér ikke databasen som ændret når ikke-data ændres (f.eks. udvidelse af grupper)</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Load automatisk databasenn når den bliver ændret udefra</translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>Posthåndtering</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>Brug gruppeikon ved oprettelse af post</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Minimér ved kopiering til udklipsholder</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Generelt</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Vis et ikon i systembakken</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>Mørk ikon i systembakken</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Skjul vindue i systembakken når det er minimeret</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Sprog</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Auto-Indsæt</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>Brug post-titel til at matche vinduer for global Auto-Indsæt</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>Brug post-URL til at matche vinduer for global Auto-Indsæt</translation>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>Spørg altid for Auto-Indsæt udføres</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Global Auto-Indsæt genvej</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation>ms</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>Timeouts</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>Ryd udklipsholder efter</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>sek</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>Lås databaserne efter inaktivitet i</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>Bekvemmelighed</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Lås databaser når sessionen låses eller låget er lukket</translation>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>Lås databaser efter at minimere vinduet</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation>Lås tidligere låste databaser efter udførsel af Auto-Indsæt</translation>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>Kræv ikke kodeord gentaget når det er synligt</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>Skjul post-noter som standard</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>Privatliv</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -216,6 +494,26 @@ Vælg venligst hvorvidt du vil tillade denne adgang.</translation>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Afbryd</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -289,14 +587,6 @@ Vælg venligst hvorvidt du vil tillade denne adgang.</translation>
         <translation>Sorter matchende poster efter &amp;brugernavn</translation>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>&amp;Fjern tilslutning til alle browsere</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>Fjern alle tilladelser fra hukommelse</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>Avanceret</translation>
     </message>
@@ -362,14 +652,6 @@ Vælg venligst hvorvidt du vil tillade denne adgang.</translation>
         <translation>&lt;b&gt;Advarsel:&lt;/b&gt;De følgende instillinger kan være farlige!</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>Eksekverbare Filer (*.exe);;Alle Filer (*.*)</translation>
-    </message>
-    <message>
-        <source>Executable Files (*)</source>
-        <translation>Eksekverbare Filer (*)</translation>
-    </message>
-    <message>
         <source>Select custom proxy location</source>
         <translation>Vælg en brugerdefineret proxy lokation</translation>
     </message>
@@ -377,6 +659,31 @@ Vælg venligst hvorvidt du vil tillade denne adgang.</translation>
         <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
         <translation>KeePassXC-Browser er desværre ikke understøttet for Snap udgivelser endnu.</translation>
     </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation type="unfinished"/>
+    </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: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not ask permission for HTTP &amp;Basic Auth</source>
+        <extracomment>An extra HTTP Basic Auth setting</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>BrowserService</name>
@@ -417,152 +724,43 @@ Vil du overskrive den?</translation>
         <translation>Vil du opdatere oplysningerne i %1 - %2?</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Database låst!</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Den aktive database er låst!
-Lås den valgte database op eller vælg en anden som er åbnet.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Indstilling er ikke tilgængelig!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation>Den aktive database inderholder ikke en post med indstillinger.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Ingen nøgler fundet</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation>Ingen delte krypertingsnøgler fundet i KeePassXC Indstillinger.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Fjernede nøgler fra database</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation><numerusform>Succesfuldt fjernet %n kryptering nøgle(r) fra KeePassXC indstillinger.</numerusform><numerusform>Fjernede succesfuldt %n krypteringsnøgle(r) fra KeePassXC indstillinger.</numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>Fjerner gemte tilladelser...</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>Afbryd</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Fjernede tilladelser</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Ingen nøgler fundet</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Den aktive database indholder ikke en post med tilladelser</translation>
-    </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>Kodeord</translation>
-    </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>Indtast kodeord</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>Gentag kodeord</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;Key fil</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>Gennemse</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Opret</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>Udfordring Svar</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Genopfrisk</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>Nøglefiler</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>Alle filer</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>Opret Nøglefil...</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>Kan ikke oprette Nøglefil :</translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>Vælg en nøglefil</translation>
+        <source>Converting attributes to custom data…</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty password</source>
-        <translation>Tomt kodeord</translation>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>Vil du virkelig bruge en tom streng som kodeord?</translation>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>Andre kodeord leveret.</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>Kunne ikke sætte %1 som Nøglefil:
-%2</translation>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Legacy key file format</source>
-        <translation>Forældet nøglefilformat</translation>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation type="unfinished"/>
     </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>Du benytter et forældet nøglefilformat, som muligvis ikke vil blive understøttet i fremtiden.
-
-Overvej at generere en ny nøglefil.</translation>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>Kunne ikke skifte hovednøgle: ingen YubiKey indsat.</translation>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -643,14 +841,6 @@ Overvej at generere en ny nøglefil.</translation>
         <translation>Ikke til stede i CSV-fil</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>Tomt feltnavn</translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>kolonne</translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>Importeret fra CSV-fil</translation>
     </message>
@@ -659,51 +849,87 @@ Overvej at generere en ny nøglefil.</translation>
         <translation>Original data:</translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>Fejl detekteret i CSV-fil !</translation>
+        <source>Error</source>
+        <translation>Fejl</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation>flere beskeder blev sprunget over]</translation>
+        <source>Empty fieldname %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Fejl</translation>
+        <source>column %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>CSV import: udskriver har fejl:
-</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>Fejl</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Kan ikke beregne hovednøgle</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
+        <source>%n column(s)</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
+        <source>%n byte(s)</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
+        <source>%n row(s)</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Rod</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DatabaseOpenWidget</name>
     <message>
         <source>Enter master key</source>
@@ -730,14 +956,6 @@ Overvej at generere en ny nøglefil.</translation>
         <translation>Udfordring Svar</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Kan ikke åbne databasen.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Kan ikke åbne nøglefil</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation>Forældet nøglefilformat</translation>
     </message>
@@ -766,106 +984,169 @@ Overvej at generere en ny nøglefil.</translation>
         <source>Select key file</source>
         <translation>Vælg nøglefil</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>Reparer database</translation>
+        <source>TouchID for quick unlock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Fejl</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Kan ikke åbne nøglefil</translation>
+        <source>Can't open key file:
+%1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Kan ikke åbne databasen.</translation>
+        <source>Passwords</source>
+        <translation>Kodeord</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
+    <message>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Generelt</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Databasen åbnede fint. Intet at gøre.</translation>
+        <source>Security</source>
+        <translation>Sikkerhed</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>Succes</translation>
+        <source>Master Key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>Databasen er blevet succesfuldt repareret
-Du kan gemme den nu.</translation>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>Kan ikke reparere databasen.</translation>
+        <source>Browser Integration</source>
+        <translation>Browser-integration</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>Generelt</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>Kryptering</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>&amp;Fjern tilslutning til alle browsere</translation>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Antallet af runder er for højt</translation>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation type="unfinished"/>
     </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>Du benytter et meget højt antal runder af nøgletransformationer med Argon2.
-
-Hvis du vil beholde antallet, så kan din database tage timer eller dage (eller endnu længere) at åbne!</translation>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Understood, keep number</source>
-        <translation>Forstået, beholder nummer</translation>
+        <source>Stored keys</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>Afbryd</translation>
+        <source>Remove</source>
+        <translation>Fjern</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Antallet af runder er for lavt</translation>
+        <source>Delete the selected key?</source>
+        <translation type="unfinished"/>
     </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>Du bruger en meget lavt antal nøgletransformeringsrunder med AES-KDF.
-
-Hvis du beholder dette antal, så kan din database være nem af knække!</translation>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KDF unchanged</source>
-        <translation>KDF uændret</translation>
+        <source>Key</source>
+        <translation>Nøgle</translation>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
-        <translation>Kunne ikke transformere nøglen med nye KDF-parametre; KDF er uændret.</translation>
+        <source>Value</source>
+        <translation>Værdi</translation>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Ingen nøgler fundet</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Fjernede nøgler fra database</translation>
     </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Fjerner gemte tilladelser...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Afbryd</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Fjernede tilladelser</translation>
+    </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
+        <source>Successfully removed permissions from %n entry(s).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: Ingen nøgler fundet</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Den aktive database indholder ikke en post med tilladelser</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetEncryption</name>
@@ -901,6 +1182,113 @@ Hvis du beholder dette antal, så kan din database være nem af knække!</transl
         <source>Parallelism:</source>
         <translation>Parallelitet:</translation>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Antallet af runder er for højt</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>Du benytter et meget højt antal runder af nøgletransformationer med Argon2.
+
+Hvis du vil beholde antallet, så kan din database tage timer eller dage (eller endnu længere) at åbne!</translation>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation>Forstået, beholder nummer</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Afbryd</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Antallet af runder er for lavt</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>Du bruger en meget lavt antal nøgletransformeringsrunder med AES-KDF.
+
+Hvis du beholder dette antal, så kan din database være nem af knække!</translation>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation>KDF uændret</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation>Kunne ikke transformere nøglen med nye KDF-parametre; KDF er uændret.</translation>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -950,91 +1338,110 @@ Hvis du beholder dette antal, så kan din database være nem af knække!</transl
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>Rod</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 Database</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Alle filer</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Åben database</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>Filen blev ikke fundet!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Kan ikke åbne databasen.</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>Fil åbnet i skrivebeskyttet tilstand</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>Åbn CSV-fil</translation>
+        <source>Add additional protection...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>CSV-fil</translation>
+        <source>No encryption key added</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>Alle filer (*)</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Flet database</translation>
+        <source>No password set</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Åben KeePass 1 database</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 type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1 database</translation>
+        <source>Unknown error</source>
+        <translation>Ukendt fejl</translation>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>Luk?</translation>
+        <source>Failed to change master key</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; er i redigeringstilstand.
-Kassér ændringer og luk alligevel?</translation>
+        <source>Database Name:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>Gem ændringer?</translation>
+        <source>Description:</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>&quot;%1&quot; blev ændret.
-Gem disse ændringer?</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 Database</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Skrivning til database fejler.</translation>
+        <source>All files</source>
+        <translation>Alle filer</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Kodeord</translation>
+        <source>Open database</source>
+        <translation>Åben database</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Gem database som</translation>
+        <source>CSV file</source>
+        <translation>CSV-fil</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>Flet database</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Åben KeePass 1 database</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 database</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1045,40 +1452,40 @@ Gem disse ændringer?</translation>
         <translation>Kan ikke skrive til CSV-fil.</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>Ny database</translation>
+        <source>Database creation error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>locked</source>
-        <translation>låst</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 type="unfinished"/>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>Lås database</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>Kan ikke låse databasen, mens du redigerer i den.
-Tryk på Afbryd for at afslutte dine ændringer eller kassere dem.</translation>
+        <source>Select CSV file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>Denne database er blevet ændret.
-Vil du gemme databasen før låsning?
-Ellers mister du dine ændringer.</translation>
+        <source>New Database</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disable safe saves?</source>
-        <translation>Slå sikre gem til?</translation>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
     </message>
     <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 har ikke været i stand til at gemme databasen flere gange. Dette er formentlig fordi en filsynkroniseringstjeneste har en lås på filen.
-Så sikre gem fra og prøv igen?</translation>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1088,37 +1495,13 @@ Så sikre gem fra og prøv igen?</translation>
         <translation>Søger...</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>Skift hovednøgle</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>Slet post?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>Vil du virkelig slette posten &quot;%1&quot; permanent?</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Slet poster?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Vil du virkelig slette %1 poster permanent?</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Flyt post til papirkurven?</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation>Ønsker du virkelig at rykke post &quot;%1&quot; til skraldespanden?</translation>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Flyt poster til skraldespanden?</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
@@ -1136,18 +1519,10 @@ Så sikre gem fra og prøv igen?</translation>
         <translation>Husk mit valg</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Slet gruppe?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>Ønsker du at slette gruppen &quot;%1&quot; permanent?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Kan ikke beregne hovednøgle</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>Ingen database valgt</translation>
     </message>
@@ -1181,10 +1556,6 @@ Do you want to merge your changes?</source>
         <translation>Database-filen har ændringer og du har ændringer som du ikke har gemt. Vil du kombinere dine ændringer med databasens? </translation>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>Kunne ikke åbne den nye databasefil i forsøget på at auto-indlæse denne database.</translation>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>Tøm skraldespanden? </translation>
     </message>
@@ -1192,88 +1563,104 @@ Do you want to merge your changes?</source>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>Er du sikker på at du vil permanent slette alt fra din skraldespand? </translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>Generér TOTP Token</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Luk</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Fil åbnet i skrivebeskyttet tilstand</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Generelt</translation>
+        <source>Lock Database?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Kodeord</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot; blev ændret.
+Gem disse ændringer?</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>Udløbsdato</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Brugernavn</translation>
+        <source>Save changes?</source>
+        <translation>Gem ændringer?</translation>
     </message>
     <message>
-        <source>Autotype</source>
-        <translation>Auto-Indsæt</translation>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>Søger</translation>
+        <source>Disable safe saves?</source>
+        <translation>Slå sikre gem til?</translation>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>Attributter</translation>
+        <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 har ikke været i stand til at gemme databasen flere gange. Dette er formentlig fordi en filsynkroniseringstjeneste har en lås på filen.
+Så sikre gem fra og prøv igen?</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Vedhæftninger</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Noter</translation>
+        <source>Passwords</source>
+        <translation>Kodeord</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>Vindue</translation>
+        <source>Save database as</source>
+        <translation>Gem database som</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>Sekvens</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 Database</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Søg</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Ryd</translation>
+        <source>Delete group</source>
+        <translation>Slet gruppe</translation>
     </message>
     <message>
-        <source>Never</source>
-        <translation>Aldrig</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[BESKYTTET]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>Deaktiveret</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Aktiveret</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1347,22 +1734,10 @@ Do you want to merge your changes?</source>
         <translation>Ny attribut</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Bekræft sletning</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>Er du sikker på at du vil fjerne denne attribut? </translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[BESKYTTET]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation>Tryk vis for at se og ændre</translation>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>I morgen</translation>
     </message>
@@ -1375,10 +1750,6 @@ Do you want to merge your changes?</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>Et år</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation>Anvend genereret kodeord?</translation>
     </message>
@@ -1390,6 +1761,26 @@ Do you want to merge your changes?</source>
         <source>Entry updated successfully.</source>
         <translation>Post blev succesfuldt opdateret.</translation>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1635,6 +2026,81 @@ Do you want to merge your changes?</source>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>Formular</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Kodeord:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1692,10 +2158,6 @@ Do you want to merge your changes?</source>
         <translation>Kan ikke hente favicon.</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Forslag: Du kan slå Google til som nødløsning under Værktøj&gt;Indstillinger&gt;Sikkerhed</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>Billeder</translation>
     </message>
@@ -1704,14 +2166,6 @@ Do you want to merge your changes?</source>
         <translation>Alle filer</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Vælg Billede</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read icon</source>
-        <translation>Kan ikke læse ikon</translation>
-    </message>
-    <message>
         <source>Custom icon already exists</source>
         <translation>Brugervalgt ikon findes allerede</translation>
     </message>
@@ -1720,8 +2174,36 @@ Do you want to merge your changes?</source>
         <translation>Bekræft sletning</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>Dette ikon bliver brugt af %1 poster, and will blive erstattet af standard-ikonet. Er du sikker på at du vil slette det? </translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1772,9 +2254,8 @@ Dette kan få det påvirkede plugin til at svigte.</translation>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation>- Klon</translation>
+        <source>%1 - Clone</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1819,10 +2300,6 @@ Dette kan få det påvirkede plugin til at svigte.</translation>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Bekræft sletning</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>Gem vedhæftninger</translation>
     </message>
@@ -1859,10 +2336,13 @@ Dette kan få det påvirkede plugin til at svigte.</translation>
 %1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>Kunne ikke åbne filer:
-%1</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1946,6 +2426,106 @@ Dette kan få det påvirkede plugin til at svigte.</translation>
         <source>Attachments</source>
         <translation>Vedhæftninger</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>Generér TOTP Token</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Luk</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Generelt</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Brugernavn</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Kodeord</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Udløbsdato</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>Attributter</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Vedhæftninger</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Noter</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Auto-Indsæt</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Vindue</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Sekvens</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Søger</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Søg</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Ryd</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Aldrig</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[BESKYTTET]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Aktiveret</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Deaktiveret</translation>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EntryView</name>
@@ -1984,6 +2564,19 @@ Dette kan få det påvirkede plugin til at svigte.</translation>
         <source>Recycle Bin</source>
         <translation>Skraldespand</translation>
     </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>HostInstaller</name>
@@ -1997,61 +2590,6 @@ Dette kan få det påvirkede plugin til at svigte.</translation>
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>Længde:</translation>
-    </message>
-    <message>
-        <source>Character Types</source>
-        <translation>Tegntyper</translation>
-    </message>
-    <message>
-        <source>Upper Case Letters</source>
-        <translation>Store Bogstaver</translation>
-    </message>
-    <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
-    </message>
-    <message>
-        <source>Lower Case Letters</source>
-        <translation>Små Bogstaver</translation>
-    </message>
-    <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
-    </message>
-    <message>
-        <source>Numbers</source>
-        <translation>Numre</translation>
-    </message>
-    <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
-    </message>
-    <message>
-        <source>Special Characters</source>
-        <translation>Specialtegn</translation>
-    </message>
-    <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
-    </message>
-    <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Udeluk lool-alike tegn</translation>
-    </message>
-    <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>Vær sikker på at dit kodeord indeholder tegn fra alle grupper</translation>
-    </message>
-    <message>
-        <source>Extended ASCII</source>
-        <translation>Udvidet ASCII</translation>
-    </message>
-</context>
-<context>
     <name>KMessageWidget</name>
     <message>
         <source>&amp;Close</source>
@@ -2076,6 +2614,26 @@ Dette kan få det påvirkede plugin til at svigte.</translation>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Forkert nøgle eller databasefil er korrupt.</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation>Database headers mangler</translation>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>Invalid størrelse for gruppefelt</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>Invalid størrelse i headerfelt</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>Invalid størrelse i headerfelt</translation>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2235,10 +2793,6 @@ Dette kan få det påvirkede plugin til at svigte.</translation>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation>Invalid ciffer uuid længde</translation>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation>Ikke understøttet ciffer</translation>
     </message>
@@ -2292,6 +2846,18 @@ Dette er en envejs konvertering. Du vil ikke være i stand til at åbne den impo
         <source>Unsupported KeePass 2 database version.</source>
         <translation>Ikke understøttet KeePass 2 database version.</translation>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2364,10 +2930,6 @@ Dette er en envejs konvertering. Du vil ikke være i stand til at åbne den impo
         <translation>Historiske elementer med forskelligt uuid</translation>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation>Ikke i stand til at dekyptere post-streng</translation>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation>Fandt ens brugerdefineret attribut</translation>
     </message>
@@ -2416,6 +2978,12 @@ Dette er en envejs konvertering. Du vil ikke være i stand til at åbne den impo
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation>Kan ikke dekomprimere binær data</translation>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2579,28 +3147,126 @@ Dette er en envejs konvertering. Du vil ikke være i stand til at åbne den impo
         <source>Invalid entry field type</source>
         <translation>Invalid post-felt-type</translation>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>Eksisterende enkelt-instans låsefil er invalid. Starter ny instans.</translation>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>Låsefil kunne ikke oprettes. Enkelt-instans-tilstand slået fra.</translation>
+        <source>Import from</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>En anden instans af KeePassXC kører allerede.</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Fatal fejl ved test af kryptografiske funktioner.</translation>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
+    <message>
+        <source>Key Component</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Fejl</translation>
+        <source>Key Component Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Afbryd</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>Gennemse</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Opret</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation>Forældet nøglefilformat</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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Nøglefiler</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Alle filer</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Opret Nøglefil...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Vælg en nøglefil</translation>
     </message>
 </context>
 <context>
@@ -2614,24 +3280,12 @@ Dette er en envejs konvertering. Du vil ikke være i stand til at åbne den impo
         <translation>&amp;Seneste databaser</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Importér</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
-        <translation>%Hjælp</translation>
+        <translation>&amp;Hjælp</translation>
     </message>
     <message>
         <source>E&amp;ntries</source>
-        <translation>Poster</translation>
-    </message>
-    <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>Kopiér att&amp;ribute til udklipsholder</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation>Tidsbaseret engangskodeord</translation>
+        <translation>&amp;Poster</translation>
     </message>
     <message>
         <source>&amp;Groups</source>
@@ -2647,7 +3301,7 @@ Dette er en envejs konvertering. Du vil ikke være i stand til at åbne den impo
     </message>
     <message>
         <source>&amp;About</source>
-        <translation>&amp;O</translation>
+        <translation>&amp;Om</translation>
     </message>
     <message>
         <source>&amp;Open database...</source>
@@ -2662,30 +3316,10 @@ Dette er en envejs konvertering. Du vil ikke være i stand til at åbne den impo
         <translation>&amp;Luk database</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>&amp;Ny database</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>Flet og kombiner fra KeePassX database</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>&amp;Tilføj ny post</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>&amp;Vis/Rediger post</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>&amp;Slet post</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>&amp;Tilføj ny gruppe</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>&amp;Rediger gruppe</translation>
     </message>
@@ -2698,14 +3332,6 @@ Dette er en envejs konvertering. Du vil ikke være i stand til at åbne den impo
         <translation>Gem database som</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Skift &amp;hovednøgle...</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>&amp;Databaseindstillinger</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>Databaseindstillinger</translation>
     </message>
@@ -2714,10 +3340,6 @@ Dette er en envejs konvertering. Du vil ikke være i stand til at åbne den impo
         <translation>&amp;Klon post</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>&amp;Find</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>Kopier &amp;brugernavn</translation>
     </message>
@@ -2726,10 +3348,6 @@ Dette er en envejs konvertering. Du vil ikke være i stand til at åbne den impo
         <translation>Kopiér brugernavn til udklipsholder</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>Kopier kodeord</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>Kopiér kodeord til udklipsholder</translation>
     </message>
@@ -2742,14 +3360,6 @@ Dette er en envejs konvertering. Du vil ikke være i stand til at åbne den impo
         <translation>Kodeordsgenerator</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation>&amp;Udfør Auto-Indsæt</translation>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>&amp;Åben URL</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>%Lås databaser</translation>
     </message>
@@ -2782,22 +3392,6 @@ Dette er en envejs konvertering. Du vil ikke være i stand til at åbne den impo
         <translation>&amp;Eksporter til CSV-fil...</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Importér KeePass 1 database...</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>Importér CSV-fil...</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Reparer database</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>Vis TOTP</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>Indstil TOTP...</translation>
     </message>
@@ -2818,14 +3412,6 @@ Dette er en envejs konvertering. Du vil ikke være i stand til at åbne den impo
         <translation>Adgangsfejl for konfigurationsfil %1</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Det ser ud til at du bruger KeePassHTTP til browser-integration. Denne funktion er forældet og vil blive fjernet i fremtiden.&lt;br&gt;Skift til KeePassXC-Browser i stedet. Besøg vores &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;konverteringsguide&lt;/a&gt; for at få hjælp (advarsel %1 af 3). &lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>skrivebeskyttet</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Indstillinger</translation>
     </message>
@@ -2838,36 +3424,277 @@ Dette er en envejs konvertering. Du vil ikke være i stand til at åbne den impo
         <translation>Luk KeePassXC</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 Database</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Tryk på knappen på din YubiKey!</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Alle filer</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation>ADVARSEL: Du bruger en ustabil udgave af KeePassXC!
+Der er høj risiko for korruption, sørg for at have en backup af dine databaser.
+Denne version er ikke beregnet til at blive brugt i produktion.</translation>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Åben database</translation>
+        <source>&amp;Donate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Gem repareret database</translation>
+        <source>Report a &amp;bug</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Skrivning til database fejler.</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Tryk på knappen på din YubiKey!</translation>
+        <source>&amp;Import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
-        <translation>ADVARSEL: Du bruger en ustabil udgave af KeePassXC!
-Der er høj risiko for korruption, sørg for at have en backup af dine databaser.
-Denne version er ikke beregnet til at blive brugt i produktion.</translation>
+        <source>Copy att&amp;ribute...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Rod</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2970,125 +3797,34 @@ Denne version er ikke beregnet til at blive brugt i produktion.</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>Dette er nødvendigt for at tilgå din database med ChromeIPass eller PassIFox</translation>
-    </message>
-    <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>Slå KeePassHTP server til</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Generelt</translation>
-    </message>
-    <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>Vis en notifikation når legitimationsoplysninger forespørges</translation>
-    </message>
-    <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>Returner kun det bedste match for en specifik URL i stedet for alle matches for hele domænet.</translation>
-    </message>
-    <message>
-        <source>&amp;Return only best matching entries</source>
-        <translation>&amp;Returnér kun de bedst matchende poster</translation>
-    </message>
-    <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Anmod om at låse databasen op hvis den er låst</translation>
-    </message>
-    <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation>Kun poster med samme skema (http://, https://, ftp://, ...) bliver returneret.</translation>
-    </message>
-    <message>
-        <source>&amp;Match URL schemes</source>
-        <translation>&amp;Match URL skemaer</translation>
-    </message>
-    <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Sorter matchende poster efter &amp;brugernavn</translation>
-    </message>
-    <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Sorter matchende poster efter &amp;navn</translation>
-    </message>
-    <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>Fjern alle delte krypteringsnøgler  i den aktive database</translation>
-    </message>
-    <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>Fjern alle gemte tilladelser fra poster i den aktive database</translation>
-    </message>
-    <message>
-        <source>Password Generator</source>
-        <translation>Kodeordsgenerator</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Avanceret</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Tillad altid &amp;adgang til poster</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Tillad alltid &amp;optaterede poster</translation>
-    </message>
-    <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>Kun den valgte database er nødt til at være forbundet med en klient.</translation>
-    </message>
-    <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>&amp;Returnér kun de bedst matchende poster</translation>
-    </message>
-    <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>At automatisk skabe eller opdatere tekst-felter er ikke understøttet.</translation>
-    </message>
-    <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>&amp;Vis avancerede tekst felter som begynder med &quot;KPH:&quot;</translation>
-    </message>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP Port:</translation>
+        <source>Enter password:</source>
+        <translation>Indtast kodeord</translation>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Standard port: 19455</translation>
+        <source>Confirm password:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC vil lytte til dette port på 127.0.0.1</translation>
+        <source>Password</source>
+        <translation>Kodeord</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;Advarsel:&lt;/b&gt;De følgende instillinger kan være farlige!</translation>
+        <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"/>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;KeePassHTTP er forældet og vil blive fjernet i fremtiden.&lt;br&gt;Skift til KeePassXC-Browser i stedet! Besøg vores &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;konverteringsguide&lt;/a&gt; for at få hjælp.&lt;/p&gt;</translation>
+        <source>Password cannot be empty.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Kan ikke forbinde via priviligerede porte</translation>
+        <source>Passwords do not match.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Kan ikke forbinde til prioriterede port under 1024!
-Bruger standard port 19455.</translation>
+        <source>Generate master password</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3159,18 +3895,10 @@ Bruger standard port 19455.</translation>
         <translation>Ordliste:</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Antal ord:</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>Ord separator:</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>Opret</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Kopier</translation>
     </message>
@@ -3183,10 +3911,6 @@ Bruger standard port 19455.</translation>
         <translation>Luk</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>Gennemfør</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>Entropy: %1 bit</translation>
     </message>
@@ -3214,6 +3938,171 @@ Bruger standard port 19455.</translation>
         <comment>Password quality</comment>
         <translation>Udmærket</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Avanceret</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Slet</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Fjern</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Deaktivér</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3234,34 +4123,18 @@ Bruger standard port 19455.</translation>
         <translation>Kan ikke dekryptere besked</translation>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
-        <translation>Tiden er udløbet eller var ikke i stand til at forbinde til KeePassXC</translation>
-    </message>
-    <message>
         <source>Action cancelled or denied</source>
         <translation>Handling afbrudt eller nægtet</translation>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation>Kan ikke kryptere besked eller den offentlige nøgle blev ikke fundet. Er native beskedhåndtering slået til i KeePassXC?</translation>
-    </message>
-    <message>
         <source>KeePassXC association failed, try again</source>
         <translation>KeePassXC associering fejlede, prøv igen</translation>
     </message>
     <message>
-        <source>Key change was not successful</source>
-        <translation>Nøgleændring fejlede</translation>
-    </message>
-    <message>
         <source>Encryption key is not recognized</source>
         <translation>Krypteringsnøgle ikke genkendt</translation>
     </message>
     <message>
-        <source>No saved databases found</source>
-        <translation>Ingen gemt database fundet</translation>
-    </message>
-    <message>
         <source>Incorrect action</source>
         <translation>Forkert handling</translation>
     </message>
@@ -3387,10 +4260,6 @@ Bruger standard port 19455.</translation>
         <translation>Indsæt kodeord for at låse %1 op:</translation>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation>Kunne ikke indlæse nøglefil %1 : %2</translation>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3474,12 +4343,6 @@ Tilgængelige kommandoer:
         <translation>fejl ved læsning fra enhed</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>fil tom !
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation>Misdannet streng</translation>
     </message>
@@ -3488,30 +4351,6 @@ Tilgængelige kommandoer:
         <translation>Mangler afsluttende kvoteringstegn</translation>
     </message>
     <message>
-        <source>AES: 256-bit</source>
-        <translation>AES: 256-bit</translation>
-    </message>
-    <message>
-        <source>Twofish: 256-bit</source>
-        <translation>Twofish: 256-bit</translation>
-    </message>
-    <message>
-        <source>ChaCha20: 256-bit</source>
-        <translation>ChaCha20: 256-bit</translation>
-    </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – anbefalet)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 4)</source>
-        <translation>AES-KDF (KDBX 4)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 3.1)</source>
-        <translation>AES-KDF (KDBX 3.1)</translation>
-    </message>
-    <message>
         <source>Group</source>
         <translation>Gruppe</translation>
     </message>
@@ -3540,10 +4379,6 @@ Tilgængelige kommandoer:
         <translation>Oprettet</translation>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
-        <translation>Forældet Browser-integration</translation>
-    </message>
-    <message>
         <source>Browser Integration</source>
         <translation>Browser-integration</translation>
     </message>
@@ -3572,10 +4407,6 @@ Tilgængelige kommandoer:
         <translation>Antal af ord for diceware nøglefrase.</translation>
     </message>
     <message>
-        <source>count</source>
-        <translation>antal</translation>
-    </message>
-    <message>
         <source>Wordlist for the diceware generator.
 [Default: EFF English]</source>
         <translation>Ordliste for diceware generator.
@@ -3586,28 +4417,438 @@ Tilgængelige kommandoer:
         <translation>Generér et nyt tilfædligt kodeord.</translation>
     </message>
     <message>
-        <source>Length of the generated password.</source>
-        <translation>Længde af det genererede kodeord.</translation>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
-        <translation>Brug små bogstaver i det genererede kodeord.</translation>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
-        <translation>Brug store bogstaver i det genererede kodeord.</translation>
+        <source>Clipboard cleared!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
-        <translation>Brug tal i det genererede kodeord.</translation>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
-        <translation>Brug specielle karakterer i det genererede kodeord.</translation>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation>antal</translation>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
-        <translation>Brug udvidet ASCII i det genererede kodeord.</translation>
+        <source>Invalid value for password length: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256-bit</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256-bit</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256-bit</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – anbefalet)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>Fjern en post fra databasen.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>Sti til posten, som skal fjernes.</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>Eksisterende enkelt-instans låsefil er invalid. Starter ny instans.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Låsefil kunne ikke oprettes. Enkelt-instans-tilstand slået fra.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - password manager til flere platforme</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>Filnavne på de kodeordsdatabaser som skal åbnes (*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>sti til brugerdefineret indstillingsfil</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>databasens nøglefil</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>Læs kodeord til databasen fra stdin</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation>Forældrevindue handle</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>En anden instans af KeePassXC kører allerede.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Fatal fejl ved test af kryptografiske funktioner.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Fejl</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3645,11 +4886,97 @@ Tilgængelige kommandoer:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
+    <message>
+        <source>Agent connection failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <source>Search...</source>
-        <translation>Søg...</translation>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
     <message>
         <source>Search</source>
         <translation>Søg</translation>
@@ -3659,314 +4986,316 @@ Tilgængelige kommandoer:
         <translation>Ryd</translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Versalfølsom</translation>
-    </message>
-    <message>
         <source>Limit search to selected group</source>
         <translation>Begræns søgning til den valgte gruppe</translation>
     </message>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation>Versalfølsom</translation>
+    </message>
 </context>
 <context>
-    <name>Service</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC: Ny nøgleassocieringsanmodelse</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation>Du har modtaget en associeringsanmodelse for the ovenstående nøgle.
-Hvis du gerne vil give den adgang til din KeePassXC database,
-så giv den et unikt navn for at kunne identificere den og accepter den.</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: Overskriv eksisterende nøgle?</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>En delt krypteringsnøgle med navnet &quot;%1&quot; findes allerede.
-Vil du overskrive den?</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: Opdater post</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Vil du opdatere oplysningerne i %1 - %2?</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Database låst!</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Den aktive database er låst!
-Lås den valgte database op eller vælg en anden som er åbnet.</translation>
+        <source>Key:</source>
+        <translation>Nøgle:</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Fjernede nøgler fra database</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <source>Generate</source>
+        <translation>Opret</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Ingen nøgler fundet</translation>
+        <source>Import</source>
+        <translation>Importér</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>Ingen delte krypteringsnøgler fundet i KeePassHttp indstillinger.</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Indstilling er ikke tilgængelig!</translation>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>Den aktive database indeholder ikke en post med KeePassHttp indstillinger.</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>Fjerner gemte tilladelser...</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>Afbryd</translation>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Fjernede tilladelser</translation>
+        <source>Remove</source>
+        <translation>Fjern</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Ingen nøgler fundet</translation>
+        <source>Status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Den aktive database indholder ikke en post med tilladelser</translation>
+        <source>Fingerprint</source>
+        <translation>Fingeraftryk</translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
-        <translation>Programindstillinger</translation>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Generelt</translation>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>Sikkerhed</translation>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>Adgangsfejl for konfigurationsfil %1</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>Grundlæggende indstillinnger</translation>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Start kun en enkelt instans af KeePassXC</translation>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>Husk seneste databaser</translation>
+        <source>All files</source>
+        <translation>Alle filer</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Husk de sidste nøglefiler og sikkerhedsdongler</translation>
+        <source>Select path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Load den forrige database ved opstart</translation>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>Gem automatisk ved afslutning</translation>
+        <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"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>Gem automatisk ved ændringer</translation>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Load automatisk databasenn når den bliver ændret udefra</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>Minimér ved kopiering til udklipsholder</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Minimér vindue ved opstart</translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>Brug gruppeikon ved oprettelse af post</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Markér ikke databasen som ændret når ikke-data ændres (f.eks. udvidelse af grupper)</translation>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
-        <translation>Skjul detaljevisning</translation>
+        <source>Never</source>
+        <translation>Aldrig</translation>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>Vis et ikon i systembakken</translation>
+        <source>Always</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>Skjul vindue i systembakken når det er minimeret</translation>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
-        <translation>Skjul vindue i systembakken når applikationen lukkes</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
-        <translation>Mørk ikon i systembakken</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Sprog</translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Auto-Indsæt</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>Brug post-titel til at matche vinduer for global Auto-Indsæt</translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>Brug post-URL til at matche vinduer for global Auto-Indsæt</translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation>Spørg altid for Auto-Indsæt udføres</translation>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Global Auto-Indsæt genvej</translation>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>Auto-Indsæt forsinkelse</translation>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation>ms</translation>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
-        <translation>Opstart</translation>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
-        <translation>Filhåndtering</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation>Gem databasefiler sikkert (kan være inkompatibelt med Dropbox, etc.)</translation>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
-        <translation>Lav backup af databasefil før der gemmes</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
-        <translation>Posthåndtering</translation>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Generelt</translation>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
-        <translation>Timeouts</translation>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>Ryd udklipsholder efter</translation>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>sek</translation>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>Lås databaserne efter inaktivitet i</translation>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Bekvemmelighed</translation>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Lås databaser når sessionen låses eller låget er lukket</translation>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>Lås databaser efter at minimere vinduet</translation>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>TotpDialog</name>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>Kræv ikke kodeord gentaget når det er synligt</translation>
+        <source>Timed Password</source>
+        <translation>Tidsbaseret kodeord</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Vis kodeord i klartekst som standard</translation>
+        <source>000000</source>
+        <translation>000000</translation>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
-        <translation>Skjul kodeord i forhåndsvisningspanelet</translation>
+        <source>Copy</source>
+        <translation>Kopier</translation>
+    </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
     <message>
-        <source>Hide entry notes by default</source>
-        <translation>Skjul post-noter som standard</translation>
+        <source>Copy</source>
+        <translation>Kopier</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>Privatliv</translation>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>Brug Google som nødløsning til at downloade website ikoner</translation>
+        <source>There was an error creating the QR code.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
-        <translation>Lås tidligere låste databaser efter udførsel af Auto-Indsæt</translation>
+        <source>Closing in %1 seconds.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation>Opsæt TOTP</translation>
@@ -3988,59 +5317,84 @@ Lås den valgte database op eller vælg en anden som er åbnet.</translation>
         <translation>Brug brugerdefinerede indstillinger</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>Note: Lav kun ændringer i disse indstillinger hvis du ved hvad du laver.</translation>
+        <source>Custom Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Time step:</source>
         <translation>Tidsinterval:</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8 cifre</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>sek</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>Kodestørrelse:</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6 cifre</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>Kodestørrelse:</translation>
+        <source>7 digits</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>sek</translation>
+        <source>8 digits</source>
+        <translation>8 cifre</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>Tidsbaseret kodeord</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Kopier</translation>
+        <source>Close</source>
+        <translation>Luk</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>Udløber om</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>sekunder</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>Lås database op</translation>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4075,42 +5429,26 @@ Lås den valgte database op eller vælg en anden som er åbnet.</translation>
     </message>
 </context>
 <context>
-    <name>main</name>
-    <message>
-        <source>Remove an entry from the database.</source>
-        <translation>Fjern en post fra databasen.</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>Sti til databasen.</translation>
-    </message>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>Path of the entry to remove.</source>
-        <translation>Sti til posten, som skal fjernes.</translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - password manager til flere platforme</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>Filnavne på de kodeordsdatabaser som skal åbnes (*.kdbx)</translation>
+        <source>Refresh</source>
+        <translation>Genopfrisk</translation>
     </message>
     <message>
-        <source>path to a custom config file</source>
-        <translation>sti til brugerdefineret indstillingsfil</translation>
+        <source>YubiKey Challenge-Response</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>databasens nøglefil</translation>
+        <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"/>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>Læs kodeord til databasen fra stdin</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Parent window handle</source>
-        <translation>Forældrevindue handle</translation>
+        <source>No YubiKey inserted.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_de.ts b/share/translations/keepassx_de.ts
index e6bb1ba63..55f0ae90e 100644
--- a/share/translations/keepassx_de.ts
+++ b/share/translations/keepassx_de.ts
@@ -38,12 +38,6 @@
         <translation>In die Zwischenablage kopieren</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>Version %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>Revision: %1</translation>
     </message>
@@ -76,35 +70,48 @@ Kernel: %3 %4</translation>
         <translation>Das KeePassXC-Team möchte ganz besonders debfx danken für die Entwicklung des ursprünglichen KeePassX.</translation>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
-        <translation>Build-Typ: %1
-</translation>
+        <source>Version %1</source>
+        <translation>Version %1</translation>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP Zugriff bestätigen</translation>
+        <source>Build Type: %1</source>
+        <translation>Build Typ: %1</translation>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>Diese Entscheidung merken</translation>
+        <source>Auto-Type</source>
+        <translation>Auto-Type</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Erlauben</translation>
+        <source>Browser Integration</source>
+        <translation>Browser-Integration</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>Ablehnen</translation>
+        <source>SSH Agent</source>
+        <translation>SSH-Agent</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>%1 hat Zugriff auf Passwörter für folgende Element(e) angefordert.
-Bitte wählen Sie, ob Sie den Zugriff erlauben möchten.</translation>
+        <source>YubiKey</source>
+        <translation>YubiKey</translation>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation>TouchID</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Keine</translation>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -113,6 +120,277 @@ Bitte wählen Sie, ob Sie den Zugriff erlauben möchten.</translation>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>SSH Agent aktivieren (Neustart erforderlich)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Anwendungseinstellungen</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Allgemein</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Sicherheit</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Zugriffsfehler für Konfigurations-Datei %1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Grundeinstellungen</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>Programmstart</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Nur eine einzige KeePassXC-Instanz starten</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Letzte Datenbank merken</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Letzte Schlüsseldateien und Sicherheits-Dongles merken</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Letzte Datenbank beim Start laden</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>Fenster beim Programmstart minimieren</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>Datei-Management</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation>Datenbankdatei sicher speichern (ggf. inkompatibel mit Dropbox etc.)</translation>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation>Vor Speichern Backup der Datenbank erstellen</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Automatisch nach jeder Änderung speichern</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Automatisch speichern beim Schließen</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Datenbank nicht als geändert markieren für geringfügige Änderungen (z.B. Ausklappen von Gruppen)</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Datenbank nach externer Änderung automatisch neu laden.</translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>Eintrags-Management</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>Gruppensymbol für das Erstellen neuer Einträge verwenden</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Minimieren beim Kopieren in die Zwischenablage</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation>Eintrag in Vorschau-Panel verstecken</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Allgemein</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation>Werkzeugleiste ausblenden (Symbole)</translation>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation>Minimieren statt die App zu beenden</translation>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Taskleistensymbol anzeigen</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>Dunkles Taskleistensymbol</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Fenster verstecken wenn minimiert</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Sprache</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Auto-Type</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>Verwende Eintragstitel, um entsprechende Fenster für globales Auto-Type zu finden</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>Verwende URL, um Fenster für globales Auto-Type zu finden.</translation>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>Immer vor einem Auto-Type fragen</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Globale Tastenkombination für Auto-Type</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation>Auto-Type Tastenanschlagverzögerung</translation>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation>ms</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation>Auto-Type Startverzögerung</translation>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>Timeouts</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>Zwischenablage leeren nach</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> sek</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>Datenbank sperren nach einer Inaktivität von</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation>TouchID vergessen nach einer Inaktivität von</translation>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>Komfort</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Datenbank schließen, wenn Sitzung geschlossen oder Deckel zugeklappt wird</translation>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation>TouchID vergessen, wenn Sitzung gesperrt oder Deckel geschlossen wird</translation>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>Datenbank sperren nach Minimieren des Fensters</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation>Datenbank nach Auto-Type automatisch wieder sperren.</translation>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>Keine erneute Passworteingabe verlangen, wenn das Passwort sichtbar ist.</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation>Passwörter beim Bearbeiten nicht verstecken</translation>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation>Keine Platzhalter für leere Passwortfelder verwenden</translation>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation>Passwörter in Vorschau-Panel verstecken</translation>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>Eintrags-Notizen standardmäßig verstecken</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>Datenschutz</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation>Verwende DuckDuckGo als Ersatz für das Herunterladen von Website-Symbole</translation>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -216,6 +494,27 @@ Bitte wählen Sie, ob Sie den Zugriff erlauben möchten.</translation>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation>KeePassXC-Browser Eintrag speichern</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
+    </message>
+    <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>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -289,14 +588,6 @@ Bitte wählen Sie, ob Sie den Zugriff erlauben möchten.</translation>
         <translation>Passende Anmeldedaten nach &amp;Benutzernamen sortieren</translation>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>Alle Browser &amp;abmelden</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>Alle gemerkten Berechtigungen &amp;vergessen</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>Fortgeschritten</translation>
     </message>
@@ -362,14 +653,6 @@ Bitte wählen Sie, ob Sie den Zugriff erlauben möchten.</translation>
         <translation>&lt;b&gt;Warnung:&lt;/b&gt; Die folgenden Optionen können gefährlich sein!</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>Ausführbare Dateien (*.exe);;Alle Dateien (*.*)</translation>
-    </message>
-    <message>
-        <source>Executable Files (*)</source>
-        <translation>Ausführbare Dateien (*)</translation>
-    </message>
-    <message>
         <source>Select custom proxy location</source>
         <translation>Benutzerdefinierten Proxy-Pfad auswählen</translation>
     </message>
@@ -377,6 +660,31 @@ Bitte wählen Sie, ob Sie den Zugriff erlauben möchten.</translation>
         <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
         <translation>Sorry, aber KeePassXC-Browser wird derzeit für Snap-Releases nicht unterstützt.</translation>
     </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation>KeePassXC-Browser wird für die Funktion der Browserintegration benötig. &lt;br /&gt;Lade es für %1 und %2 herunter.</translation>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation>&amp;Tor Browser</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: </source>
+        <translation>&lt;b&gt;Achtung&lt;/b&gt;, die keepassxc-proxy Anwendung wurde nicht gefunden!&lt;br /&gt;Bitte überprüfe den KeePassXC-Ordner oder bestätige den benutzerdefinierten Ort in den erweiterten Einstellungen.&lt;br /&gt;Die Browseranbindung wird nicht funktionieren, wenn das Proxyprogramm nicht eingebunden ist.&lt;br /&gt;Vermuteter Pfad:</translation>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation>Ausführbare Dateien</translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation>Alle Dateien</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"/>
+    </message>
 </context>
 <context>
     <name>BrowserService</name>
@@ -417,151 +725,44 @@ Möchten Sie diesen überschreiben?</translation>
         <translation>Möchten Sie wirklich die Informationen in %1 - %2 aktualisieren?</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Datenbank gesperrt!</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Die aktive Datenbank ist gesperrt!
-Bitte entsperren Sie die ausgewählte Datenbank oder wählen Sie eine andere, die entsperrt ist.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Einstellung nicht verfügbar!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation>Die aktive Datenbank enthält keinen Einstellungseintrag.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Kein Schlüssel gefunden</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation>Kein geteilter Schlüssel in den KeePassXC-Einstellungen gefunden.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Schlüssel aus der Datenbank entfernt</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation><numerusform>Es wurde erfolgreich %n Schlüssel aus den KeePassXC-Einstellungen entfernt.</numerusform><numerusform>Es wurden erfolgreich %n Schlüssel aus den KeePassXC-Einstellungen entfernt.</numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>Entferne gespeicherte Berechtigungen...</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Zugangsdaten entfernt</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation><numerusform>Gespeicherte Berechtigungen wurden erfolgreich aus %n Eintrag entfernt.</numerusform><numerusform>Gespeicherte Berechtigungen wurden erfolgreich aus %n Einträgen entfernt.</numerusform></translation>
+        <source>Converting attributes to custom data…</source>
+        <translation>Attribute werden in zusätzliche Eigenschaften umgewandelt...</translation>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Kein Eintrag mit Zugangsdaten gefunden!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Diese Datenbank enthält keinen Eintrag mit Zugangsdaten.</translation>
-    </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>Passwort</translation>
-    </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>Passwort eingeben:</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>Passwort wiederholen:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;Schlüsseldatei</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>Durchsuchen</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Erstellen</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>Cha&amp;llenge-Response</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Neu laden</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>Schlüsseldateien</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>Alle Dateien</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>Schlüsseldatei erzeugen…</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>Erzeugen der Schlüsseldatei nicht möglich:</translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>Schlüsseldatei auswählen</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Leeres Passwort</translation>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation>KeepassXC: KeePassHTTP-Attribute wurden umgewandelt</translation>
     </message>
     <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>Wollen Sie wirklich eine leere Zeichenkette als Passwort verwenden?</translation>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation>%1 Einträge wurden erfolgreich umgewandelt
+%2 Schlüssel zu zusätzlichen Eigenschaften verschoben.</translation>
     </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>Unterschiedliche Passwörter eingegeben.</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>Festlegen von %1 als Schlüsseldatei nicht möglich: %2</translation>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Legacy key file format</source>
-        <translation>Veraltetes Schlüsseldatei-Format</translation>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation>Die aktive Datenbank enthält keinen Eintrag mit KeePassHTTP Einstellungen.</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>Sie verwenden ein veraltetes Schlüsseldatei-Format, welches in Zukunft evtl. nicht mehr unterstützt wird.
-
-Bitte denken Sie darüber nach, eine neue Schlüsseldatei zu generieren.</translation>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation>KeePassXC: native Browser-Integrations-Einstellungen gefunden</translation>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>Ändern des Master-Passworts fehlgeschlagen: kein YubiKey eingesteckt.</translation>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -642,14 +843,6 @@ Bitte denken Sie darüber nach, eine neue Schlüsseldatei zu generieren.</transl
         <translation>Nicht in CSV-Datei vorhanden</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>Leerer Feldname</translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>Spalte</translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>Aus CSV-Datei importiert</translation>
     </message>
@@ -658,47 +851,84 @@ Bitte denken Sie darüber nach, eine neue Schlüsseldatei zu generieren.</transl
         <translation>Original-Daten:</translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>Fehler in CSV-Datei gefunden!</translation>
+        <source>Error</source>
+        <translation>Fehler</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation>weitere Fehler ausgeblendet]</translation>
+        <source>Empty fieldname %1</source>
+        <translation>Leerer Feldname %1</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Fehler</translation>
+        <source>column %1</source>
+        <translation>Spalte %1</translation>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>CSV-Import: Fehler beim Schreiben:</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation>Fehler in CSV-Datei gefunden!</translation>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>Fehler</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Berechnung des Master-Passworts gescheitert</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation>CSV-Import: Fehler beim Schreiben: %1</translation>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
-        <translation><numerusform>%n Byte</numerusform><numerusform>%n Bytes</numerusform></translation>
+        <source>%n column(s)</source>
+        <translation><numerusform>%n Spalte</numerusform><numerusform>%n Spalten</numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation>%1, %2, %3</translation>
     </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
-        <translation><numerusform>%n Zeile,</numerusform><numerusform>%n Zeilen,</numerusform></translation>
+        <source>%n byte(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
-        <translation><numerusform>%n Spalte</numerusform><numerusform>%n Spalten</numerusform></translation>
+        <source>%n row(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Root</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Öffnen der Datei %1 nicht möglich.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation>Datenbank entsperren - KeePassXC</translation>
     </message>
 </context>
 <context>
@@ -728,14 +958,6 @@ Bitte denken Sie darüber nach, eine neue Schlüsseldatei zu generieren.</transl
         <translation>Challenge-Response</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Öffnen der Datenbank ist nicht möglich.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Schlüsseldatei kann nicht geöffnet werden</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation>Veraltetes Schlüsseldatei-Format</translation>
     </message>
@@ -764,105 +986,171 @@ Bitte denken Sie darüber nach, eine neue Schlüsseldatei zu generieren.</transl
         <source>Select key file</source>
         <translation>Schlüsseldatei auswählen</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>Datenbank reparieren</translation>
+        <source>TouchID for quick unlock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Fehler</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation>Öffnen der Datenbank nicht möglich:
+%1</translation>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Schlüsseldatei kann nicht geöffnet werden</translation>
+        <source>Can't open key file:
+%1</source>
+        <translation>Schlüsseldatei kann nicht geöffnet werden:
+%1</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Öffnen der Datenbank ist nicht möglich.</translation>
+        <source>Passwords</source>
+        <translation>Passwörter</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Fortgeschrittene Einstellungen</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Allgemein</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Datenbank wurde ordnungsgemäß geöffnet. Es gibt nichts zu tun.</translation>
+        <source>Security</source>
+        <translation>Sicherheit</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>Erfolg</translation>
+        <source>Master Key</source>
+        <translation>Master-Passwort</translation>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>Datenbank erfolgreich repariert
-sie kann nun gespeichert werden.</translation>
+        <source>Encryption Settings</source>
+        <translation>Verschlüsselungseinstellung</translation>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>Reparieren der Datenbank nicht möglich.</translation>
+        <source>Browser Integration</source>
+        <translation>Browser-Integration</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>Allgemein</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation>KeePassXC-Browser-Einstellungen</translation>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>Verschlüsselung</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>Alle Browser &amp;abmelden</translation>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Anzahl Runden zu hoch</translation>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation type="unfinished"/>
     </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>Sie verwenden eine sehr hohe Rundenanzahl mit Argon2.
-
-Wenn Sie diese Anzahl beibehalten, könnte Ihre Datenbank Stunden oder Tage (oder noch länger) zum Öffnen benötigen.</translation>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Understood, keep number</source>
-        <translation>Verstanden, Anzahl beibehalten</translation>
+        <source>Stored keys</source>
+        <translation>Gespeicherte Schlüssel</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>Abbrechen</translation>
+        <source>Remove</source>
+        <translation>Entfernen</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Anzahl Runden zu niedrig</translation>
+        <source>Delete the selected key?</source>
+        <translation>Die ausgewählten Schlüssel entfernen?</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>Sie verwenden eine sehr niedrige Rundenanzahl mit AES-KDF.
-
-Wenn Sie diese Anzahl beibehalten, könnte Ihre Datenbank zu einfach zu knacken sein!</translation>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KDF unchanged</source>
-        <translation>KDF unverändert</translation>
+        <source>Key</source>
+        <translation>Schlüssel</translation>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
-        <translation>Konnte Schlüssel nicht mit den neuen KDF-Parametern transformieren; KDF unverändert.</translation>
+        <source>Value</source>
+        <translation>Wert</translation>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation>Um diese Einstellungen zu verändern, benötigst du einen verbundenen Browser.</translation>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation>Alle Browser trennen</translation>
+    </message>
+    <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?
+Das wird die Verbindung zu dem Browser-Plugin verhindern.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Kein Schlüssel gefunden</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation>Keine geteilten Schlüssel in den KeePassXC-Einstellungen gefunden.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Schlüssel aus der Datenbank entfernt</translation>
     </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
-        <translation><numerusform> MiB</numerusform><numerusform> MiB</numerusform></translation>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Entferne gespeicherte Berechtigungen...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Abbrechen</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Zugangsdaten entfernt</translation>
     </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
-        <translation><numerusform> Thread</numerusform><numerusform> Threads</numerusform></translation>
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: Kein Eintrag mit Zugangsdaten gefunden!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Diese Datenbank enthält keinen Eintrag mit Zugangsdaten.</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
     </message>
 </context>
 <context>
@@ -899,6 +1187,113 @@ Wenn Sie diese Anzahl beibehalten, könnte Ihre Datenbank zu einfach zu knacken
         <source>Parallelism:</source>
         <translation>Parallelität:</translation>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation>Zeit zum Entschlüsseln:</translation>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation>Veränderunge</translation>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation>100 ms</translation>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation>5 s</translation>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation>Datenbanformat:</translation>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation>KDBX 4.0 (empfohlen)</translation>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation>KDBX 3.1</translation>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation>unverändert</translation>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Anzahl Runden zu hoch</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>Sie verwenden eine sehr hohe Rundenanzahl mit Argon2.
+
+Wenn Sie diese Anzahl beibehalten, könnte Ihre Datenbank Stunden oder Tage (oder noch länger) zum Öffnen benötigen.</translation>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation>Verstanden, Anzahl beibehalten</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Anzahl Runden zu niedrig</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>Sie verwenden eine sehr niedrige Rundenanzahl mit AES-KDF.
+
+Wenn Sie diese Anzahl beibehalten, könnte Ihre Datenbank zu einfach zu knacken sein!</translation>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation>KDF unverändert</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation>Konnte Schlüssel nicht mit den neuen KDF-Parametern transformieren; KDF unverändert.</translation>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation><numerusform>MiB</numerusform><numerusform>MiB</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation><numerusform>Thread(s)</numerusform><numerusform>Thread(s)</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation><numerusform>%1 ms</numerusform><numerusform>%1 ms</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -948,91 +1343,112 @@ Wenn Sie diese Anzahl beibehalten, könnte Ihre Datenbank zu einfach zu knacken
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>Root</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 Datenbank</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Alle Dateien</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Datenbank öffnen</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>Datei nicht gefunden!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Öffnen der Datenbank ist nicht möglich.</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>Datei ist schreibgeschützt</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>CSV-Datei öffnen</translation>
+        <source>Add additional protection...</source>
+        <translation>Zusätzlichen Schutz hinzufügen</translation>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>CSV-Datei</translation>
+        <source>No encryption key added</source>
+        <translation>Kein Schlüssel zum Verschlüsseln hinzugefügt</translation>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>Alle Dateien (*)</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation>Du musst mindestens einen Schlüssel hinzufügen um die Datenbank abzusichern.</translation>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Datenbank zusammenführen</translation>
+        <source>No password set</source>
+        <translation>Kein Passwort eingestellt</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>KeePass 1-Datenbank öffnen</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>WARNUNG! Du hast kein Passwort gesetzt. Eine Datenbank ohne Passwort zu benutzen ist absolut nicht empfohlen.
+
+Soll tatsächlich ohne Passwort fortgefahren werden?</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1-Datenbank</translation>
+        <source>Unknown error</source>
+        <translation>Unbekannter Fehler</translation>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>Schließen?</translation>
+        <source>Failed to change master key</source>
+        <translation>Ändern des Hauptschlüssels gescheitert</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; wird bearbeitet.
-Änderungen verwerfen und trotzdem schließen?</translation>
+        <source>Database Name:</source>
+        <translation>Datenbankname:</translation>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>Änderungen speichern?</translation>
+        <source>Description:</source>
+        <translation>Beschreibung:</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>&quot;%1&quot; wurde geändert.
-Änderungen speichern?</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 Datenbank</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Schreiben der Datenbank fehlgeschlagen.</translation>
+        <source>All files</source>
+        <translation>Alle Dateien</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Passwörter</translation>
+        <source>Open database</source>
+        <translation>Datenbank öffnen</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Datenbank speichern als</translation>
+        <source>CSV file</source>
+        <translation>CSV-Datei</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>Datenbank zusammenführen</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>KeePass 1-Datenbank öffnen</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1-Datenbank</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1043,40 +1459,41 @@ Save changes?</source>
         <translation>Die CSV Datei konnte nicht gespeichert werden.</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>Neue Datenbank</translation>
+        <source>Database creation error</source>
+        <translation>Datenbank konnte nicht erstellt werden.</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>Die erstellte Datenbank hat keinen Schlüssel oder KDF, sie kann nicht gespeichert werden.
+Das ist definitiv ein Fehler, teile das bitte den Entwicklern mit.</translation>
     </message>
     <message>
-        <source>locked</source>
-        <translation>gesperrt</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation>Die Datenbankdatei existiert nicht oder ist nicht zugreifbar.</translation>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>Datenbank sperren</translation>
+        <source>Select CSV file</source>
+        <translation>Ausgewählte CSV-Datei</translation>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>Die Datenbank kann nicht gesperrt werden, da sie gerade bearbeitet wird.
-Wählen sie „Abbrechen“, um die Änderungen zu speichern oder sie zurückzunehmen.</translation>
+        <source>New Database</source>
+        <translation>Neue Datenbank</translation>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>Diese Datenbank wurde geändert.
-Soll sie gespeichert werden bevor sie gesperrt wird?
-Anderenfalls gehen Ihre Änderungen seit dem letzten Speichern verloren.</translation>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Neue Datenbank]</translation>
     </message>
     <message>
-        <source>Disable safe saves?</source>
-        <translation>Sicheres Speichern deaktivieren?</translation>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Gesperrt]</translation>
     </message>
     <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 konnte die Datenbank nach mehrmaligem Versuch nicht erfolgreich speichern. Dies wird möglicherweise durch Synchronisierungsdienste verursacht, die die Datei geöffnet halten.
-Sicheres Speichern deaktivieren und erneut versuchen?</translation>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Schreibgeschützt]</translation>
     </message>
 </context>
 <context>
@@ -1086,37 +1503,13 @@ Sicheres Speichern deaktivieren und erneut versuchen?</translation>
         <translation>Suche…</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>Master-Passwort ändern</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>Eintrag löschen?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>Wollen Sie den Eintrag „%1“ wirklich löschen?</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Einträge löschen?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Wollen Sie die Einträge &quot;%1&quot; wirklich löschen?</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Eintrag in den Papierkorb verschieben?</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation>Möchten Sie wirklich den Eintrag &quot;%1&quot; in den Papierkorb verschieben?</translation>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Einträge in den Papierkorb verschieben?</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation><numerusform>Möchten Sie wirklich %n Eintrag aus dem Papierkorb löschen?</numerusform><numerusform>Möchten Sie wirklich %n Einträge aus dem Papierkorb löschen?</numerusform></translation>
@@ -1134,18 +1527,10 @@ Sicheres Speichern deaktivieren und erneut versuchen?</translation>
         <translation>Meine Auswahl merken</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Gruppe löschen?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>Wollen Sie die Gruppe &quot;%1&quot; wirklich löschen?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Berechnung des Master-Passworts gescheitert</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>Keine aktuelle Datenbank</translation>
     </message>
@@ -1180,10 +1565,6 @@ Do you want to merge your changes?</source>
 Möchten Sie Ihre Änderungen zusammenführen?</translation>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>Die neue Datenbankdatei konnte nicht geöffnet werden, während versucht wurde, diese neu zu laden.</translation>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>Papierkorb leeren?</translation>
     </message>
@@ -1191,88 +1572,108 @@ Möchten Sie Ihre Änderungen zusammenführen?</translation>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>Sind Sie sicher, dass Sie den Inhalt des Papierkorbs unwiederbringlich löschen wollen?</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>TOTP-Token generieren</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation><numerusform>Sollen tatsächlich %1 Einträge gelöscht werden?</numerusform><numerusform>Sollen tatsächlich %1 Einträge gelöscht werden?</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation><numerusform>Eintrag/Einträge löschen?</numerusform><numerusform>Eintrag/Einträge löschen?</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation><numerusform>Eintrag/Einträge in den Papierkorb verschieben?</numerusform><numerusform>Eintrag/Einträge in den Papierkorb verschieben?</numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Schließen</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Datei ist schreibgeschützt</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Allgemein</translation>
+        <source>Lock Database?</source>
+        <translation>Datenbank sperren?</translation>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Passwort</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation>Ein Eintrag wird bearbeitet.
+Änderungen verwerfen und trotzdem sperren?</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot; wurde geändert.
+Änderungen speichern?</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>Ablaufdatum</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation>Datenbank wurde geändert.
+Änderungen speichern?</translation>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Benutzername</translation>
+        <source>Save changes?</source>
+        <translation>Änderungen speichern?</translation>
     </message>
     <message>
-        <source>Autotype</source>
-        <translation>Auto-Type</translation>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation>Datenbank konnte während einer automatischen Aktualisierung nicht geladen werden.
+Fehler: %1</translation>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>Suche</translation>
+        <source>Disable safe saves?</source>
+        <translation>Sicheres Speichern deaktivieren?</translation>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>Attribute</translation>
+        <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 konnte die Datenbank nach mehrmaligem Versuch nicht erfolgreich speichern. Dies wird möglicherweise durch Synchronisierungsdienste verursacht, die die Datei geöffnet halten.
+Sicheres Speichern deaktivieren und erneut versuchen?</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Anhänge</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation>Schreiben der Datenbank fehlgeschlagen.
+%1</translation>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Notizen</translation>
+        <source>Passwords</source>
+        <translation>Passwörter</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>Fenster</translation>
+        <source>Save database as</source>
+        <translation>Datenbank speichern als</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>Sequenz</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 Datenbank</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Suche</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Löschen</translation>
+        <source>Delete group</source>
+        <translation>Gruppe löschen</translation>
     </message>
     <message>
-        <source>Never</source>
-        <translation>Niemals</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[GESCHÜTZT]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>Deaktiviert</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Aktiviert</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1346,22 +1747,10 @@ Möchten Sie Ihre Änderungen zusammenführen?</translation>
         <translation>Neue Eigenschaft</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Entfernen bestätigen</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>Sind Sie sicher, dass Sie dieses Attribut entfernen möchten?</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[GESCHÜTZT]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation>Klicken zum Anzeigen oder Bearbeiten</translation>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>Morgen</translation>
     </message>
@@ -1374,10 +1763,6 @@ Möchten Sie Ihre Änderungen zusammenführen?</translation>
         <translation><numerusform>%n Monat</numerusform><numerusform>%n Monate</numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 Jahr</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation>Erzeugtes Passwort anwenden?</translation>
     </message>
@@ -1389,6 +1774,26 @@ Möchten Sie Ihre Änderungen zusammenführen?</translation>
         <source>Entry updated successfully.</source>
         <translation>Eintrag erfolgreich aktualisiert.</translation>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation>Eintrag enthält nicht gespeicherte Änderungen</translation>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation>Neue Eigenschaft %1</translation>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation>[GESCHÜTZT] Klicken Sie „Zeigen“ zum Anzeigen oder Bearbeiten</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n Jahre</numerusform><numerusform>%n Jahre</numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1634,6 +2039,81 @@ Möchten Sie Ihre Änderungen zusammenführen?</translation>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>Formular</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Passwort:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1691,10 +2171,6 @@ Möchten Sie Ihre Änderungen zusammenführen?</translation>
         <translation>Abrufen des Favicons nicht möglich</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Tipp: Sie können Google als Fallback festlegen unter Werkzeuge&gt;Einstellungen&gt;Sicherheit</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>Bilder</translation>
     </message>
@@ -1703,14 +2179,6 @@ Möchten Sie Ihre Änderungen zusammenführen?</translation>
         <translation>Alle Dateien</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Bild auswählen</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read icon</source>
-        <translation>Symbol kann nicht gelesen werden</translation>
-    </message>
-    <message>
         <source>Custom icon already exists</source>
         <translation>Es gibt bereits ein eigenes Symbol </translation>
     </message>
@@ -1719,8 +2187,36 @@ Möchten Sie Ihre Änderungen zusammenführen?</translation>
         <translation>Löschen bestätigen</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>Dieses Symbol wird noch von %1 Einträgen verwendet und würde mit dem Standard-Symbol ersetzt. Sind Sie sicher, dass die fortfahren wollen?</translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation>Benutzerdefiniertes Symbol erfolgreich heruntergeladen</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>Tipp: Sie können DuckDuckgo als Ausweichelösung unter Werkzeuge&gt;Einstellungen&gt;Sicherheit festlegen</translation>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation>Bild(er) auswählen</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation><numerusform>%1 von %n Symbol(en) erfolgreiche heruntergeladen</numerusform><numerusform>%1 von %n Symbol(en) erfolgreiche heruntergeladen</numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation>Keine Symbole wurden geladen</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation><numerusform>%n Symbol(e) gibt es bereits in der Datenbank</numerusform><numerusform>%n Symbol(e) gibt es bereits in der Datenbank</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation><numerusform>Das Laden der folgenden Symbole ist fehlgeschlagen:</numerusform><numerusform>Das Laden der folgenden Symbole ist fehlgeschlagen:</numerusform></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>Dieses Symbol wird von %n Eintrag/Einträgen benutzt und wird mit dem Standardsymbol ersetzt. Bist du sicher, dass es gelöscht werden soll?</numerusform><numerusform>Dieses Symbol wird von %n Eintrag/Einträgen benutzt und wird mit dem Standardsymbol ersetzt. Bist du sicher, dass es gelöscht werden soll?</numerusform></translation>
     </message>
 </context>
 <context>
@@ -1771,9 +2267,8 @@ Dies kann dazu führen, dass die jeweiligen Plugins nicht mehr richtig funktioni
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation>- Klon</translation>
+        <source>%1 - Clone</source>
+        <translation>%1 - Kopie</translation>
     </message>
 </context>
 <context>
@@ -1818,10 +2313,6 @@ Dies kann dazu führen, dass die jeweiligen Plugins nicht mehr richtig funktioni
         <translation><numerusform>Sind Sie sicher, dass sie einen Anhang löschen möchten?</numerusform><numerusform>Sind Sie sicher, dass sie %n Anhänge löschen möchten?</numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Entfernen bestätigen</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>Anhänge speichern</translation>
     </message>
@@ -1858,9 +2349,13 @@ Dies kann dazu führen, dass die jeweiligen Plugins nicht mehr richtig funktioni
 %1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation>Entfernen bestätigen</translation>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>Öffnen der Datei nicht möglich</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1944,6 +2439,106 @@ Dies kann dazu führen, dass die jeweiligen Plugins nicht mehr richtig funktioni
         <source>Attachments</source>
         <translation>Anhänge</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>Ja</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>TOTP-Token generieren</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Schließen</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Allgemein</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Benutzername</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Passwort</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Ablaufdatum</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>Attribute</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Anhänge</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notizen</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Auto-Type</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Fenster</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Sequenz</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Suche</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Suche</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Löschen</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Niemals</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[GESCHÜTZT]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Aktiviert</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Deaktiviert</translation>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EntryView</name>
@@ -1982,6 +2577,19 @@ Dies kann dazu führen, dass die jeweiligen Plugins nicht mehr richtig funktioni
         <source>Recycle Bin</source>
         <translation>Papierkorb</translation>
     </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation>[leer]</translation>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>HostInstaller</name>
@@ -1995,61 +2603,6 @@ Dies kann dazu führen, dass die jeweiligen Plugins nicht mehr richtig funktioni
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>Länge:</translation>
-    </message>
-    <message>
-        <source>Character Types</source>
-        <translation>Zeichenarten</translation>
-    </message>
-    <message>
-        <source>Upper Case Letters</source>
-        <translation>Großbuchstaben</translation>
-    </message>
-    <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
-    </message>
-    <message>
-        <source>Lower Case Letters</source>
-        <translation>Kleinbuchstaben</translation>
-    </message>
-    <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
-    </message>
-    <message>
-        <source>Numbers</source>
-        <translation>Zahlen</translation>
-    </message>
-    <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
-    </message>
-    <message>
-        <source>Special Characters</source>
-        <translation>Sonderzeichen</translation>
-    </message>
-    <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
-    </message>
-    <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Gleich aussehende Zeichen ausschließen</translation>
-    </message>
-    <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>Sicherstellen, dass das Passwort Zeichen aus allen Gruppen enthält.</translation>
-    </message>
-    <message>
-        <source>Extended ASCII</source>
-        <translation>Erweitertes ASCII</translation>
-    </message>
-</context>
-<context>
     <name>KMessageWidget</name>
     <message>
         <source>&amp;Close</source>
@@ -2074,6 +2627,26 @@ Dies kann dazu führen, dass die jeweiligen Plugins nicht mehr richtig funktioni
         <source>Wrong key or database file is corrupt.</source>
         <translation>Falscher Schlüssel oder die Datenbank ist beschädigt.</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation>fehlende Datenbank-Header</translation>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation>Header stimmt nicht mit Hash überein</translation>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>Ungültige Größe der Header-ID</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>Ungültiger Header-Feldlänge</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>Ungültige Header-Datenlänge</translation>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2233,10 +2806,6 @@ Dies kann dazu führen, dass die jeweiligen Plugins nicht mehr richtig funktioni
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation>Ungültige Länge der Algorithmus-UUID</translation>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation>Nicht unterstützter Verschlüsselungsalgorithmus</translation>
     </message>
@@ -2290,6 +2859,18 @@ Dieser Vorgang ist nur in eine Richtung möglich. Die importierte Datenbank kann
         <source>Unsupported KeePass 2 database version.</source>
         <translation>Nicht unterstützte KeePass 2-Datenbank-Version</translation>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation>Ungültige Länge der Cipher-UUID: %1 (Länge: %2)</translation>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation>UUID konnte nicht gelesen werden: %1</translation>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2362,10 +2943,6 @@ Dieser Vorgang ist nur in eine Richtung möglich. Die importierte Datenbank kann
         <translation>Verlaufselement mit anderer UUID</translation>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation>Eintrags-Zeichenfolge konnte nicht entschlüssel werden</translation>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation>Doppelte Benutzerattribut gefunden</translation>
     </message>
@@ -2414,6 +2991,14 @@ Dieser Vorgang ist nur in eine Richtung möglich. Die importierte Datenbank kann
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation>Binärdatei konnte nicht dekomprimiert werden</translation>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation>XML Fehler:
+%1
+Zeile %2, Spalte %3</translation>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2577,28 +3162,129 @@ Dieser Vorgang ist nur in eine Richtung möglich. Die importierte Datenbank kann
         <source>Invalid entry field type</source>
         <translation>Ungültiger Eintrags-Feldtyp</translation>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>Vorhandene einmal-Sperrdatei ist ungültig. Starte neuen Vorgang.  </translation>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>Lock-Datei konnte nicht erstellt werden. Einzelinstanzmodus ist deaktiviert.</translation>
+        <source>Import from</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Eine andere KeePassXC-Instanz läuft bereits</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Fataler Fehler beim Testen der kryptografischen Funktionen.</translation>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Fehler</translation>
+        <source>Key Component</source>
+        <translation>Schlüsselkomponente</translation>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation>Schlüsselkomponentenbeschreibung</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation>Schlüsselkomponente wurde gewählt. Klicken um sie zu ändern oder zu löschen</translation>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation>%1 hinzufügen</translation>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation>%1 ändern</translation>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation>%1 entfernen</translation>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation>%1 gewählt. Klicken um sie zu ändern oder zu löschen</translation>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>Durchsuchen</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Generieren</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation>Schlüsseldatei</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;Für zusätzliche Sicherheit kann eine Schlüsseldatei aus zufälligen Zeichen hinzugefügt werden.&lt;/p&gt;&lt;p&gt;Sie muss geheim gehalten werden und darf niemals verloren gehen, ansonsten wird die Datenbank für immer gesperrt sein.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation>Veraltetes Schlüsseldatei-Format</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>Sie verwenden ein veraltetes Schlüsseldatei-Format, welches in Zukunft evtl. nicht mehr unterstützt wird.
+
+Bitte denken Sie darüber nach eine neue Schlüsseldatei zu generieren.</translation>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation>Die Schlüsseldatei &apos;%1&apos; kann nicht geladen werden.
+Fehler: %2</translation>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Schlüsseldateien</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Alle Dateien</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Schlüsseldatei erzeugen…</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation>Fehler beim Erstellen der Schlüsseldatei </translation>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation>Schlüsseldatei kann nicht erstellt werden: %1</translation>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Schlüsseldatei auswählen</translation>
     </message>
 </context>
 <context>
@@ -2612,10 +3298,6 @@ Dieser Vorgang ist nur in eine Richtung möglich. Die importierte Datenbank kann
         <translation>&amp;Zuletzt verwendete Datenbanken</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Importieren</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
@@ -2624,14 +3306,6 @@ Dieser Vorgang ist nur in eine Richtung möglich. Die importierte Datenbank kann
         <translation>Ei&amp;nträge</translation>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>Feld in &amp;Zwischenablage kopieren</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation>Zeitbasiertes Einmal-Passwort (TOTP)</translation>
-    </message>
-    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Gruppen</translation>
     </message>
@@ -2660,30 +3334,10 @@ Dieser Vorgang ist nur in eine Richtung möglich. Die importierte Datenbank kann
         <translation>&amp;Datenbank schließen</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>&amp;Neue Datenbank</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>Mit KeePassXC-Datenbank zusammenführen</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>Neuen Eintrag &amp;hinzufügen</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>Eintrag &amp;anzeigen/bearbeiten</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>Eintrag &amp;löschen</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>&amp;Neue Gruppe hinzufügen</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>Gruppe b&amp;earbeiten</translation>
     </message>
@@ -2696,14 +3350,6 @@ Dieser Vorgang ist nur in eine Richtung möglich. Die importierte Datenbank kann
         <translation>Datenbank speichern unter...</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>&amp;Master-Passwort ändern...</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>&amp;Datenbankeinstellungen</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>Datenbankeinstellungen</translation>
     </message>
@@ -2712,10 +3358,6 @@ Dieser Vorgang ist nur in eine Richtung möglich. Die importierte Datenbank kann
         <translation>Eintrag &amp;klonen</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>&amp;Suchen</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>&amp;Benutzernamen kopieren</translation>
     </message>
@@ -2724,10 +3366,6 @@ Dieser Vorgang ist nur in eine Richtung möglich. Die importierte Datenbank kann
         <translation>Benutzernamen in die Zwischenablage kopieren</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>Passwort kop&amp;ieren</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>Passwort in die Zwischenablage kopieren</translation>
     </message>
@@ -2740,14 +3378,6 @@ Dieser Vorgang ist nur in eine Richtung möglich. Die importierte Datenbank kann
         <translation>Passwortgenerator</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation>&amp;Auto-Type ausführen</translation>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>URL &amp;öffnen</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>Datenbank &amp;sperren</translation>
     </message>
@@ -2780,22 +3410,6 @@ Dieser Vorgang ist nur in eine Richtung möglich. Die importierte Datenbank kann
         <translation>Als CSV-Datei &amp;exportieren...</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>KeePass 1-Datenbank importieren...</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>CSV-Datei importieren...</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Datenbank repar&amp;ieren...</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>TOTP anzeigen</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>TOTP einrichten...</translation>
     </message>
@@ -2816,14 +3430,6 @@ Dieser Vorgang ist nur in eine Richtung möglich. Die importierte Datenbank kann
         <translation>Zugriffsfehler für Konfigurations-Datei %1</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Es sie aus, als ob Sie KeePassHTTP für Browser-Integration nutzen. Dieses Feature is veraltet und wird in Zukunft entfernt. &lt;br&gt;Bitte wechseln Sie zu KeePassXC-Browser! Für Hilfe bei der Migration, lesen Sie unseren &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;Migrations-Leitfaden&lt;/a&gt; (Warnung %1 von 3).</translation>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>Nur Lesezugriff</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
@@ -2836,36 +3442,278 @@ Dieser Vorgang ist nur in eine Richtung möglich. Die importierte Datenbank kann
         <translation>KeePassXC beenden</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 Datenbank</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Bitte drücken Sie den Button Ihres YubiKeys</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Alle Dateien</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation>WARNUNG: Sie verwenden eine instabile Version von KeePassXC!
+Es besteht ein hohes Risiko für Datenkorruption, pflegen Sie ein Backup Ihrer Datenbank.
+Diese Version ist nicht für den Produktiveinsatz gedacht.</translation>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Datenbank öffnen</translation>
+        <source>&amp;Donate</source>
+        <translation>&amp;Spenden</translation>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Reparierte Datenbank speichern</translation>
+        <source>Report a &amp;bug</source>
+        <translation>Einen &amp;Fehler melden</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Schreiben der Datenbank fehlgeschlagen.</translation>
+        <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>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Bitte drücken Sie den Button Ihres YubiKeys</translation>
+        <source>&amp;Import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
-        <translation>WARNUNG: Sie verwenden eine instabile Version von KeePassXC!
-Es besteht ein hohes Risiko für Datenkorruption, pflegen Sie ein Backup Ihrer Datenbank.
-Diese Version ist nicht für den Produktiveinsatz gedacht.</translation>
+        <source>Copy att&amp;ribute...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation>TOTP...</translation>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation>Eine neue Datenbank erstellen</translation>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation>Aus einer anderen KDBX-Datenbank zusammenführen</translation>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation>Einen neuen Eintrag hinzufügen</translation>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation>Eintrag anzeigen oder bearbeiten</translation>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation>Eine neue Gruppe hinzufügen</translation>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation>Hauptschlüssel ändern ...</translation>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation>KeePass 1-Datenbank importieren</translation>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation>CSV-Datei...</translation>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation>CSV-Datei importieren</translation>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation>TOTP anzeigen...</translation>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation>TOTP QR-Code anzeigen...</translation>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation>Fehlendes Symbol hinzufügen %1</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Root</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Fortgeschrittene Einstellungen</translation>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation>Grundeinstellungen</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <translation>Verschlüsselungseinstellung</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 type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation>Datenbank-Master-Passwort</translation>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2968,125 +3816,34 @@ Diese Version ist nicht für den Produktiveinsatz gedacht.</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>Dies wird benötigt, um auf Ihre Datenbanken in ChromeIPass oder PassIFox zuzugreifen.</translation>
-    </message>
-    <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>KeePassHTTP-Server aktivieren</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Allgemein</translation>
-    </message>
-    <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>Zeig&amp;e eine Benachrichtigung, wenn Anmeldedaten angefordert werden.</translation>
-    </message>
-    <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>Nur die am besten passenden Einträge für eine URL anstatt aller Einträge der ganzen Domäne anzeigen.</translation>
-    </message>
-    <message>
-        <source>&amp;Return only best matching entries</source>
-        <translation>Nur beste Treffer anzeigen</translation>
-    </message>
-    <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Verlange Entsperrung, wenn die Datenbank gesperrt ist.</translation>
-    </message>
-    <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation>Nur Einträge mit dem gleichen Schema (http://, https://, ftp://, …) anzeigen</translation>
-    </message>
-    <message>
-        <source>&amp;Match URL schemes</source>
-        <translation>URL-Schema verwenden</translation>
-    </message>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Passende Einträge nach &amp;Benutzernamen sortieren</translation>
-    </message>
-    <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>&amp;Passende Einträge nach Titel sortieren</translation>
-    </message>
-    <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>&amp;Entferne alle freigegebenen Chiffrierschlüssel aus der aktiven Datenbank</translation>
-    </message>
-    <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>Entferne alle gespeicherten Berechtigungen für Einträge in der aktiven Datenbank</translation>
-    </message>
-    <message>
-        <source>Password Generator</source>
-        <translation>Passwortgenerator</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Fortgeschritten</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>&amp;Zugriff auf Einträge immer erlauben</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>&amp;Aktualisierung von Einträgen immer erlauben</translation>
-    </message>
-    <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>Nur die ausgewählte Datenbank muss mit dem Client verbunden sein.</translation>
-    </message>
-    <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Suche in allen offenen Datenbanken nach übereinstimmenden Einträgen</translation>
-    </message>
-    <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>Automatisches Erstellen und Aktualisieren von erweiterten Attributen wird nicht unterstützt!</translation>
-    </message>
-    <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>Zeige auch erweiterte Attribute, welche mit &quot;KPH: &quot; beginnen</translation>
-    </message>
-    <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP-Port:</translation>
+        <source>Enter password:</source>
+        <translation>Passwort eingeben:</translation>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Standard-Port: 19455</translation>
+        <source>Confirm password:</source>
+        <translation>Passwort bestätigen:</translation>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC überwacht diesen Port auf 127.0.0.1</translation>
+        <source>Password</source>
+        <translation>Passwort</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;Warnung:&lt;/b&gt; Die folgenden Optionen können gefährlich sein!</translation>
+        <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"/>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;KeePassHTTP ist veraltet und wird in Zukunft nicht mehr unterstützt. &lt;br&gt;Bitte wechseln Sie zu KeePassXC-Browser! Für Hilfe bei der Migration, lesen Sie unseren &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;Migrations-Leitfaden&lt;/a&gt;.&lt;/p&gt;</translation>
+        <source>Password cannot be empty.</source>
+        <translation>Passwort kann nicht leer sein.</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Privilegierte Ports können nicht überwacht werden</translation>
+        <source>Passwords do not match.</source>
+        <translation>Die Passwörter stimmen nicht überein.</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Privilegierte Ports unterhalb von 1024 können nicht überwacht werden.
-Es wird der Standard-Port 19455 verwendet.</translation>
+        <source>Generate master password</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3157,18 +3914,10 @@ Es wird der Standard-Port 19455 verwendet.</translation>
         <translation>Wortliste</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Wort-Anzahl</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>Wort-Trenner</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>Generieren</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
@@ -3181,10 +3930,6 @@ Es wird der Standard-Port 19455 verwendet.</translation>
         <translation>Schließen</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>Anwenden</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>Entropie: %1 bit</translation>
     </message>
@@ -3212,6 +3957,171 @@ Es wird der Standard-Port 19455 verwendet.</translation>
         <comment>Password quality</comment>
         <translation>Ausgezeichnet</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation>Zum fortgeschrittenen Modus wechseln</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Fortgeschritten</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation>Zum einfachen Modus wechseln</translation>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation>Einfach</translation>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation>Nicht einbeziehen:</translation>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation>Hex</translation>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Löschen</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Entfernen</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Deaktivieren</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3232,34 +4142,18 @@ Es wird der Standard-Port 19455 verwendet.</translation>
         <translation>Nachricht konnte nicht entschlüsselt werden</translation>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
-        <translation>Timeout oder Verbindung zu KeePassXC fehlgeschlagen</translation>
-    </message>
-    <message>
         <source>Action cancelled or denied</source>
         <translation>Aktion abgebrochen oder verweigert</translation>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation>Nachricht konnte nicht entschlüsselt werden oder öffentlicher Schlüssel wurde nicht gefunden. Ist Native-Messaging in KeePassXC aktiviert ?</translation>
-    </message>
-    <message>
         <source>KeePassXC association failed, try again</source>
         <translation>KeePassXC-Verbindung fehlgeschlagen, bitte erneut versuchen</translation>
     </message>
     <message>
-        <source>Key change was not successful</source>
-        <translation>Schlüsselaustausch nicht erfolgreich</translation>
-    </message>
-    <message>
         <source>Encryption key is not recognized</source>
         <translation>Schlüssel nicht erkannt</translation>
     </message>
     <message>
-        <source>No saved databases found</source>
-        <translation>Keine gespeicherten Datenbanken gefunden</translation>
-    </message>
-    <message>
         <source>Incorrect action</source>
         <translation>Falsche Aktion</translation>
     </message>
@@ -3385,10 +4279,6 @@ Es wird der Standard-Port 19455 verwendet.</translation>
         <translation>Passwort eingeben, um %1 zu entsperren:</translation>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation>Schlüsseldatei %1: konnte nicht geladen werden: %2</translation>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3472,11 +4362,6 @@ Verfügbare Kommandos:
         <translation>Fehler beim Lesen des Geräts</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>Datei ist leer</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation>Ungültige Zeichenfolge</translation>
     </message>
@@ -3485,30 +4370,6 @@ Verfügbare Kommandos:
         <translation>Schließendes Anführungszeichen fehlt</translation>
     </message>
     <message>
-        <source>AES: 256-bit</source>
-        <translation>AES: 256-bit</translation>
-    </message>
-    <message>
-        <source>Twofish: 256-bit</source>
-        <translation>Twofish: 256-bit</translation>
-    </message>
-    <message>
-        <source>ChaCha20: 256-bit</source>
-        <translation>ChaCha20: 256-bit</translation>
-    </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – empfohlen)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 4)</source>
-        <translation>AES-KDF (KDBX 4)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 3.1)</source>
-        <translation>AES-KDF (KDBX 3.1)</translation>
-    </message>
-    <message>
         <source>Group</source>
         <translation>Gruppe</translation>
     </message>
@@ -3537,10 +4398,6 @@ Verfügbare Kommandos:
         <translation>Erstellt</translation>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
-        <translation>Veraltete Browser-Integration</translation>
-    </message>
-    <message>
         <source>Browser Integration</source>
         <translation>Browser-Integration</translation>
     </message>
@@ -3569,10 +4426,6 @@ Verfügbare Kommandos:
         <translation>Wort-Anzahl für die Diceware-Passphrase.</translation>
     </message>
     <message>
-        <source>count</source>
-        <translation>Anzahl</translation>
-    </message>
-    <message>
         <source>Wordlist for the diceware generator.
 [Default: EFF English]</source>
         <translation>Wortliste für den Diceware-Generator.
@@ -3583,28 +4436,438 @@ Verfügbare Kommandos:
         <translation>Neues zufälliges Passwort erzeugen.</translation>
     </message>
     <message>
-        <source>Length of the generated password.</source>
-        <translation>Länge des erzeugten Passworts.</translation>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation>Passwort für neuen Eintrag eingeben:</translation>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
-        <translation>Kleinbuchstaben zur Passwort-Erzeugung verwenden.</translation>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
-        <translation>Großbuchstaben zur Passwort-Erzeugung verwenden.</translation>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
-        <translation>Zahlen zur Passwort-Erzeugung verwenden.</translation>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
-        <translation>Sonderzeichen zur Passwort-Erzeugung verwenden.</translation>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
-        <translation>Erweiterte ASCII-Zeichen zur Passwort-Erzeugung verwenden.</translation>
+        <source>Entry %1 not found.</source>
+        <translation>Eintrag %1 nicht gefunden.</translation>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation>Zwischenablage geleert!</translation>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation>Anzahl</translation>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation>Eintrag mit dem Pfad %1 nicht gefunden.</translation>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation>Neues Passwort für Eintrag eingeben:</translation>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation>Schreiben der Datenbank fehlgeschlagen: %1</translation>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation>Länge: %1</translation>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation>Entropie %1</translation>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation>Log10 %1</translation>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation>Typ: Bruteforce</translation>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation>Typ: Wörterbuch</translation>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation>Typ: Wiederholt</translation>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation>Typ: Sequenz</translation>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation>Typ: Datum</translation>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation>Typ: Unbekannt%1</translation>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation>Entropie %1 (%2)</translation>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Öffnen der Datei %1 nicht möglich.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation>Kleinbuchstaben verwenden</translation>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation>Großbuchstaben verwenden</translation>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation>Ziffern verwenden.</translation>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation>Sonderzeichen verwenden</translation>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation>Erweitertes ASCII verwenden</translation>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation>Zeichensatz ausschließen</translation>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation>Datei leer</translation>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256-bit</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256-bit</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256-bit</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – empfohlen)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation>Ungültige Einstellungen</translation>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation>Ungültiger Schlüssel</translation>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>Eintrag aus der Datenbank entfernen</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>Pfad des zu entfernenden Eintrags.</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>Vorhandene einmal-Sperrdatei ist ungültig. Starte neuen Vorgang.  </translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Lock-Datei konnte nicht erstellt werden. Einzelinstanzmodus ist deaktiviert.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - Plattformübergreifender Passwortmanager</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>Dateinamen der zu öffnenden Datenbanken (*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>Pfad zu einer benutzerdefinierten Konfigurationsdatei</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>Schlüsseldatei der Datenbank</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>Passwort der Datenbank von stdin lesen</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation>Eltern-Fenster-Handle</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Eine andere KeePassXC-Instanz läuft bereits</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Fataler Fehler beim Testen der kryptografischen Funktionen.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Fehler</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation>Datenbankpasswort:</translation>
     </message>
 </context>
 <context>
@@ -3642,12 +4905,98 @@ Verfügbare Kommandos:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
     <message>
-        <source>Search...</source>
-        <translation>Suche…</translation>
+        <source>Agent connection failed.</source>
+        <translation>Agent-Verbindung fehlgeschlagen.</translation>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation>Agent-Protokollfehler.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation>Kein Agent ausgeführt, kann keine Identität hinzufügen.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation>Kein Agent ausgeführt, kann keine Identität entfernen.</translation>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation>Agent lehnt diese Identität ab. Mögliche Gründe sind:</translation>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation>Der Schlüssel wurde bereits hinzugefügt.</translation>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation>Eingeschränkte Lebensdauer wird durch den Agenten nicht unterstützt (Optionen prüfen).</translation>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation>Eine Bestätigungsanfrage wird durch den Agenten nicht unterstützt (Optionen prüfen).</translation>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation>Hilfe durchsuchen</translation>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation>Modifikatoren</translation>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation>Ausdruck von Ergebnissen ausschließen</translation>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation>Exakter Ausdruck</translation>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation>Felder</translation>
     </message>
     <message>
+        <source>Term Wildcards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation>logisches ODER</translation>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation>Beispiele</translation>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
         <source>Search</source>
         <translation>Suche</translation>
     </message>
@@ -3656,315 +5005,316 @@ Verfügbare Kommandos:
         <translation>Löschen</translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Groß- /Kleinschreibung beachten</translation>
-    </message>
-    <message>
         <source>Limit search to selected group</source>
         <translation>Suche auf ausgewählte Gruppe beschränken</translation>
     </message>
+    <message>
+        <source>Search Help</source>
+        <translation>Hilfe durchsuchen</translation>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation>Groß-/Kleinschreibung unterscheiden</translation>
+    </message>
 </context>
 <context>
-    <name>Service</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC: Neue Schlüsselverbindungsanfrage</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation>Sie haben eine Verbindungsanfrage für den obigen Schlüssel
-erhalten. Wenn Sie den Zugriff auf Ihre KeePassXC-Datenbank
-erlauben möchten, geben Sie der Verbindungen einen eindeutigen 
-Namen und akzeptieren Sie.</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: Bestehenden Schlüssel überschreiben?</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Ein freigegebener Chiffrierschlüssel mit dem Namen &quot;%1&quot; existiert schon.
-Möchten Sie ihn überschreiben?</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: Eintrag aktualisiert</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Möchten Sie wirklich die Informationen in %1 - %2 aktualisieren?</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Datenbank gesperrt!</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Die aktive Datenbank ist gesperrt!
-Bitte entsperren Sie die ausgewählte Datenbank oder wählen Sie eine andere, die entsperrt ist.</translation>
+        <source>Key:</source>
+        <translation>Schlüssel:</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Schlüssel aus der Datenbank entfernt</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation><numerusform>%n Schlüssel erfolgreich aus KeePassXC/HTTP-Einstellungen entfernt.</numerusform><numerusform>%n Schlüssel erfolgreich aus KeePassXC/HTTP-Einstellungen entfernt.</numerusform></translation>
+        <source>Generate</source>
+        <translation>Generieren</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Kein Schlüssel gefunden</translation>
+        <source>Import</source>
+        <translation>Importieren</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>Kein freigegebener Chiffrierschlüssel in den KeePassHTTP-Einstellungen gefunden.</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Einstellung nicht verfügbar!</translation>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>Die aktive Datenbank enthält keinen Eintrag für KeePassHTTP Einstellungen.</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>Gespeicherte Berechtigungen werden gelöscht...</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>Abbrechen</translation>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Zugangsdaten entfernt</translation>
+        <source>Remove</source>
+        <translation>Entfernen</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation><numerusform>Gespeicherte Berechtigungen wurden erfolgreich aus %n Eintrag entfernt.</numerusform><numerusform>Gespeicherte Berechtigungen wurden erfolgreich aus %n Einträgen entfernt.</numerusform></translation>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Kein Eintrag mit Zugangsdaten gefunden!</translation>
+        <source>Status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>The aktive Datenbank enthält keinen Eintrag mit Zugangsdaten.</translation>
+        <source>Fingerprint</source>
+        <translation>Fingerabdruck</translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
-        <translation>Anwendungseinstellungen</translation>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Allgemein</translation>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>Sicherheit</translation>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>Zugriffsfehler für Konfigurations-Datei %1</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>Grundeinstellungen</translation>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Nur eine einzige KeePassXC-Instanz starten</translation>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>Letzte Datenbank merken</translation>
+        <source>All files</source>
+        <translation>Alle Dateien</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Letzte Schlüsseldateien und Sicherheits-Dongles merken</translation>
+        <source>Select path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Letzte Datenbank beim Start laden</translation>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>Automatisch speichern beim Schließen</translation>
+        <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"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>Automatisch nach jeder Änderung speichern</translation>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Datenbank nach externer Änderung automatisch neu laden.</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>Minimieren beim Kopieren in die Zwischenablage</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Fenster beim Programmstart minimieren</translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>Gruppensymbol für das Erstellen neuer Einträge verwenden</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Datenbank nicht als geändert markieren für geringfügige Änderungen (z.B. Ausklappen von Gruppen)</translation>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
-        <translation>Detailansicht verstecken</translation>
+        <source>Never</source>
+        <translation>Niemals</translation>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>Taskleistensymbol anzeigen</translation>
+        <source>Always</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>Fenster verstecken wenn minimiert</translation>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
-        <translation>Fenster zur Taskleiste minimieren statt das Programm zu beenden</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
-        <translation>Dunkles Taskleistensymbol</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Sprache</translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Auto-Type</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>Verwende Eintragstitel, um entsprechende Fenster für globales Auto-Type zu finden</translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>Verwende URL, um Fenster für globales Auto-Type zu finden.</translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation>Immer vor einem Auto-Type fragen</translation>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Globale Tastenkombination für Auto-Type</translation>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>Auto-Type-Verzögerung</translation>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation>ms</translation>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
-        <translation>Programmstart</translation>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
-        <translation>Datei-Management</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation>Datenbankdatei sicher speichern (ggf. inkompatibel mit Dropbox etc.)</translation>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
-        <translation>Vor Speichern Backup der Datenbank erstellen</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
-        <translation>Eintrags-Management</translation>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Allgemein</translation>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
-        <translation>Timeouts</translation>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>Zwischenablage leeren nach</translation>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> sek</translation>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>Datenbank sperren nach einer Inaktivität von</translation>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Komfort</translation>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Datenbank schließen, wenn Sitzung geschlossen oder Deckel zugeklappt wird</translation>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>Datenbank sperren nach Minimieren des Fensters</translation>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>TotpDialog</name>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>Keine erneute Passworteingabe verlangen, wenn das Passwort sichtbar ist.</translation>
+        <source>Timed Password</source>
+        <translation>Zeitbasiertes Passwort</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Passwörter standardmäßig im Klartext anzeigen</translation>
+        <source>000000</source>
+        <translation>000000</translation>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
-        <translation>Passwörter in Vorschau-Panel verstecken</translation>
+        <source>Copy</source>
+        <translation>Kopieren</translation>
     </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
     <message>
-        <source>Hide entry notes by default</source>
-        <translation>Eintrags-Notizen standardmäßig verstecken</translation>
+        <source>Copy</source>
+        <translation>Kopieren</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>Datenschutz</translation>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>Google als Reservesystem fürs Herunterladen von Website-Symbolen verwenden</translation>
+        <source>There was an error creating the QR code.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
-        <translation>Datenbank nach Auto-Type automatisch wieder sperren.</translation>
+        <source>Closing in %1 seconds.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation>TOTP einrichten</translation>
@@ -3986,59 +5336,84 @@ Bitte entsperren Sie die ausgewählte Datenbank oder wählen Sie eine andere, di
         <translation>Verwende eigene Einstellungen</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>Hinweis: Ändern Sie diese Einstellungen nur, wenn Sie wissen, was Sie tun.</translation>
+        <source>Custom Settings</source>
+        <translation>Eigene Einstellungen</translation>
     </message>
     <message>
         <source>Time step:</source>
         <translation>Zeitschritt:</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8 Ziffern</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> sek</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>Code-Länge:</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6 Ziffern</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>Code-Länge:</translation>
+        <source>7 digits</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> sek</translation>
+        <source>8 digits</source>
+        <translation>8 Ziffern</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>Zeitbasiertes Passwort</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Kopieren</translation>
+        <source>Close</source>
+        <translation>Schließen</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>Verfällt in</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>Sekunden</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>Datenbank entsperren</translation>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4073,42 +5448,26 @@ Bitte entsperren Sie die ausgewählte Datenbank oder wählen Sie eine andere, di
     </message>
 </context>
 <context>
-    <name>main</name>
-    <message>
-        <source>Remove an entry from the database.</source>
-        <translation>Eintrag aus der Datenbank entfernen</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>Pfad zur Datenbank.</translation>
-    </message>
-    <message>
-        <source>Path of the entry to remove.</source>
-        <translation>Pfad des zu entfernenden Eintrags.</translation>
-    </message>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - Plattformübergreifender Passwortmanager</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>Dateinamen der zu öffnenden Datenbanken (*.kdbx)</translation>
+        <source>Refresh</source>
+        <translation>Neu laden</translation>
     </message>
     <message>
-        <source>path to a custom config file</source>
-        <translation>Pfad zu einer benutzerdefinierten Konfigurationsdatei</translation>
+        <source>YubiKey Challenge-Response</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>Schlüsseldatei der Datenbank</translation>
+        <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"/>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>Passwort der Datenbank von stdin lesen</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Parent window handle</source>
-        <translation>Eltern-Fenster-Handle</translation>
+        <source>No YubiKey inserted.</source>
+        <translation>Kein YubiKey angeschlossen.</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_el.ts b/share/translations/keepassx_el.ts
index e8ca2dc83..5c1e9d8ff 100644
--- a/share/translations/keepassx_el.ts
+++ b/share/translations/keepassx_el.ts
@@ -38,12 +38,6 @@
         <translation>Αντιγραφή στο πρόχειρο</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>Έκδοση %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>Αναθεώρηση: %1</translation>
     </message>
@@ -73,44 +67,329 @@ Kernel: %3 %4</source>
     </message>
     <message>
         <source>Special thanks from the KeePassXC team go to debfx for creating the original KeePassX.</source>
+        <translation>Η Ομάδα του KeePassXC ευχαριστεί ιδιαίτερα τον ή την debfx που δημιούργησε το πρώτο KeePassx.</translation>
+    </message>
+    <message>
+        <source>Version %1</source>
+        <translation>Έκδοση %1</translation>
+    </message>
+    <message>
+        <source>Build Type: %1</source>
+        <translation>Τύπος build: %1</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Αυτόματη-Γραφή</translation>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation>Ενσωμάτωση Περιηγητή</translation>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation>πράκτορας SSH</translation>
+    </message>
+    <message>
+        <source>YubiKey</source>
+        <translation>YubiKey</translation>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation>TouchID</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>None</translation>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>AccessControlDialog</name>
+    <name>AgentSettingsWidget</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP Επιβεβαίωση Πρόσβασης</translation>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation>Ενεργοποίηση πράκτορα SSH (απαιτεί επανεκκίνηση)</translation>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>Να θυμάσαι αυτή την απόφαση</translation>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
     <message>
-        <source>Allow</source>
-        <translation>Αποδοχή</translation>
+        <source>Application Settings</source>
+        <translation>Ρυθμίσεις Εφαρμογής</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>Άρνηση</translation>
+        <source>General</source>
+        <translation>Γενικά</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>%1 έχει ζητήσει πρόσβαση σε κωδικούς για το/τα ακόλουθο/α αντικείμενο/α.
-Παρακαλώ επιλέξετε εάν θέλετε να επιτρέψετε τη πρόσβαση.</translation>
+        <source>Security</source>
+        <translation>Ασφάλεια</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Σφάλματος πρόσβασης για αρχείο ρυθμίσεων %1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>AgentSettingsWidget</name>
+    <name>ApplicationSettingsWidgetGeneral</name>
     <message>
-        <source>Enable SSH Agent (requires restart)</source>
-        <translation>Ενεργοποίηση πράκτορα SSH (απαιτεί επανεκκίνηση)</translation>
+        <source>Basic Settings</source>
+        <translation>Βασικές Ρυθμίσεις</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>Startup</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Εκκίνηση μόνον μιας περίπτωσης KeePassXC</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Θυμηθείτε την τελευταία βάσεις δεδομένων</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Να θυμάσαι το τελευταίο αρχείο κλειδιού και φορητές συσκευές ασφαλείας</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Φόρτωμα προηγούμενων βάσεων δεδομένων κατά την εκκίνηση</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>Ελαχιστοποίηση παραθύρου κατά την εκκίνηση</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>Διαχείριση αρχείων</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation>Ασφαλής αποθήκευση αρχείων βάσης δεδομένων (λειτουργία ίσως ασύμβατη με Dropbox, κλπ)</translation>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation>Δημιουργήστε αντίγραφα ασφαλείας της βάσης δεδομένων πριν αποθηκεύσετε</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Αυτόματη Αποθήκευση μετά απο κάθε αλλαγή</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Αυτόματη αποθήκευση κατα την έξοδο</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Η βάση δεδομένων να μην σημαίνεται ως τροποποιημένη για αλλαγές που δεν αφορούν δεδομένα (π.χ. επέκταση ομάδων)</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Αυτόματη επαναφόρτωση βάσης σε περίπτωση εξωτερικής τροποποίησης</translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>Διαχείριση καταχώρισης</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>Χρησιμοποίηση εικονιδίου ομάδας κατα την δημιουργία καταχώρησης</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Ελαχιστοποίηση οταν αντιγράφετε στο πρόχειρο</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation>Απόκρυψη του πλαισίου προεπισκόπισης καταχωρήσεων</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Γενικά</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation>Απόκρυψη εργαλειοθήκης (εικονιδίων)</translation>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation>Ελλαχιστοποίηση αντί για έξοδος από την εφαρμογή</translation>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Δείχνουν ένα εικονίδιο του δίσκου συστήματος</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>Σκοτεινό εικονίδιο περιοχής συστήματος</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Απόκρυψη του παραθύρου στην περιοχή συστήματος όταν γίνεται ελλαχιστοποίηση</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Γλώσσα</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Αυτόματη-Γραφή</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>Να γίνεται χρήση του τίτλου για το ταίριασμα των παραθύρων της λειτουργίας Auto-Type</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>Να γίνεται χρήση του URL του τίτλου για το ταίριασμα των παραθύρων λειτουργίας Auto-Type</translation>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>Πάντα ερώτηση για την εκτέλεση του Auto-Type</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Συντόμευση για την λειτουργία Auto-Type</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation>Καθυστέρηση πληκτρολόγησης στο Auto-Type</translation>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation> ms</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation>Καθυστέρηση έναρξης του Auto-Type</translation>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>Χρονικά όρια λήξης</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>Εκκαθάριση πρόχειρου μετά από</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>δευτερόλεπτα</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>Κλείδωμα βάσης δεδομένων μετα απο ανενεργεία </translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation> min</translation>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation>Απενεργοποίηση του TouchID μετά από αδράνεια</translation>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>Ευκολία</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Κλείδωμα βάσεων δεδομένων κατά το κλείδωμα της συνεδρίας ή την αναδίπλωση της οθόνης</translation>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation>Απενεργοποίηση του TouchID όταν η συνεδρία κλειδώνει ή το κάλυμα κλείνει</translation>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>Κλείδωμα της βάσης δεδομένων μετά την ελαχιστοποίηση του παραθύρου</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation>Να κλειδώνει εκ νέου η προηγούμενα κλειδωμένη βάση δεδομένων μετά την χρήση του Auto-Type</translation>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>Να μην απαιτείται επανάληψη του κωδικού όταν αυτός είναι ορατός</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation>Να μην αποκρύβονται οι κωδικοί όταν γίνεται επεξεργασία τους</translation>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation>Να μην γίνεται χρήση συμβόλου υποκατάστασης για τα κενά πεδία κωδικών</translation>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation>Απόκρυψη των κωδικών στο πλαίσιο προεπισκόπισης καταχωρήσεων</translation>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>Να αποκρύπτονται εξ ορισμού οι σημειώσεις καταχωρήσεων</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>Ιδιωτικότητα</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation>Να γίνεται χρήση του DuckDuckGo ως εναλλακτικής πηγής για λήψη εικονιδίων ιστοσελίδων</translation>
     </message>
 </context>
 <context>
@@ -129,19 +408,19 @@ Please select whether you want to allow access.</source>
     </message>
     <message>
         <source>The Syntax of your Auto-Type statement is incorrect!</source>
-        <translation type="unfinished"/>
+        <translation>Η Σύνταξη της εντολής Auto-Type είναι εσφαλμένη!</translation>
     </message>
     <message>
         <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
-        <translation type="unfinished"/>
+        <translation>Αυτή η εντολή Auto-Type περιέχει μια πολύ μεγάλη καθυστέρηση. Θέλετε να προχωρήσετε;</translation>
     </message>
     <message>
         <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
-        <translation type="unfinished"/>
+        <translation>Αυτή η εντολή Auto-Type περιέχει πολύ αργή πληκτρολόγηση. Θέλετε να προχωρήσετε;</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>Αυτή η εντολή Auto-Type περιέχει λειτουργίες που επαναλαμβάνονται πολύ συχνά. Θέλετε να προχωρήσετε;</translation>
     </message>
 </context>
 <context>
@@ -193,7 +472,7 @@ Please select whether you want to allow access.</source>
     <name>BrowserAccessControlDialog</name>
     <message>
         <source>KeePassXC-Browser Confirm Access</source>
-        <translation type="unfinished"/>
+        <translation>Kee-PassXC-Browser Επιβεβαίωση πρόσβασης</translation>
     </message>
     <message>
         <source>Remember this decision</source>
@@ -215,6 +494,27 @@ Please select whether you want to allow access.</source>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation>KeePassXC-Browser Αποθήκευση καταχώρησης</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>ΟΚ</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Άκυρο</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation>Έχετε ανοικτές πολλές βάσεις δεδομένων
+Παρακαλώ επιλέξτε την σωστή βάση για την αποθήκευση των διαπιστευτηρίων.</translation>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -222,11 +522,11 @@ Please select whether you want to allow access.</source>
     </message>
     <message>
         <source>This is required for accessing your databases with KeePassXC-Browser</source>
-        <translation type="unfinished"/>
+        <translation>Αυτό απαιτείται για να έχετε πρόσβαση στις βάσεις δεδομένων με το KeePassXC-Browser</translation>
     </message>
     <message>
         <source>Enable KeepassXC browser integration</source>
-        <translation type="unfinished"/>
+        <translation>Ενεργοποίηση της συνεργασίας του περιηγητή ιστού και του KeePassXC</translation>
     </message>
     <message>
         <source>General</source>
@@ -234,7 +534,7 @@ Please select whether you want to allow access.</source>
     </message>
     <message>
         <source>Enable integration for these browsers:</source>
-        <translation type="unfinished"/>
+        <translation>Ενεργοποίηση της ενσωμάτωσης με τους ακόλουθους περιηγητές:</translation>
     </message>
     <message>
         <source>&amp;Google Chrome</source>
@@ -255,7 +555,7 @@ Please select whether you want to allow access.</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>Εμφάνιση &amp;ειδοποίησης όταν απαιτούνται διαπιστευτήρια</translation>
     </message>
     <message>
         <source>Re&amp;quest to unlock the database if it is locked</source>
@@ -288,14 +588,6 @@ Please select whether you want to allow access.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>Για προχωρημένους</translation>
     </message>
@@ -361,19 +653,36 @@ Please select whether you want to allow access.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <source>Select custom proxy location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Executable Files (*)</source>
+        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Select custom proxy location</source>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
+        <source>&amp;Tor Browser</source>
+        <translation type="unfinished"/>
+    </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: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not ask permission for HTTP &amp;Basic Auth</source>
+        <extracomment>An extra HTTP Basic Auth setting</extracomment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -412,149 +721,44 @@ Do you want to overwrite it?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Βάση δεδομένων κλειδωμένη!</translation>
+        <source>Abort</source>
+        <translation>Διακοπή</translation>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
+        <source>Converting attributes to custom data…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Ρυθμισμένες μη διαθέσιμες!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Δε βρεθήκαν κλειδιά</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Κλειδιά αφαιρέθηκαν από τη βάση</translation>
-    </message>
     <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <source>Successfully moved %n keys to custom data.</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Removing stored permissions…</source>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>Διακοπή</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Δικαιώματα αφαιρέθηκαν</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Δε βρέθηκε καταχώρηση με δικαιώματα!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>Κωδικός</translation>
-    </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>Εισάγετε κωδικό:</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>Επαναλάβετε τον κωδικό:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;Αρχείο κλειδί</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>Αναζήτηση</translation>
-    </message>
     <message>
-        <source>Create</source>
-        <translation>Δημιουργία</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Refresh</source>
-        <translation>Ανανέωση</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>Αρχεία κλειδιά</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>Όλα τα αρχεία</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>Δημιουργεία αρχείου κλειδιού...</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>Αποτυχία δημιουργεία αρχείου κλειδιού:</translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>Επιλέξτε ένα αρχείο κλειδί</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Κενός κωδικός</translation>
-    </message>
-    <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>Θέλετε στα αλήθεια να χρησιμοποιήσετε μια άδεια σειρά σαν κωδικό;</translation>
-    </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>Παρέχονται διαφορετικοί κωδικοί.</translation>
-    </message>
-    <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>Αποτυχία ορισμού του %1 ως αρχείου κλειδιού</translation>
-    </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation type="unfinished"/>
-    </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>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>Η αλλαγή του πρωτεύοντος κλειδιού απέτυχε: δεν εισήχθη YubiKey.</translation>
-    </message>
 </context>
 <context>
     <name>CloneDialog</name>
@@ -634,14 +838,6 @@ Please consider generating a new key file.</source>
         <translation>Δεν υπάρχει στο αρχείο CSV</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>Κενό όνομα πεδίου</translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>στήλη</translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>Εισήχθη από αρχείο CSV</translation>
     </message>
@@ -650,50 +846,87 @@ Please consider generating a new key file.</source>
         <translation>Αρχικά δεδομένα:</translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>Σφάλμα/τα εντοπίστηκε/αν στο αρχείο CSV !</translation>
+        <source>Error</source>
+        <translation>Σφάλμα</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation>Περισσότερα μηνύματα έχουν παραλειφθεί]</translation>
+        <source>Empty fieldname %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Σφάλμα</translation>
+        <source>column %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
+        <source>Error(s) detected in CSV file!</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>Σφάλμα</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Σε θέση να υπολογίσει το κύριο κλειδί</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
+        <source>%n column(s)</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
+        <source>%n byte(s)</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
+        <source>%n row(s)</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Ρίζα</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DatabaseOpenWidget</name>
     <message>
         <source>Enter master key</source>
@@ -720,14 +953,6 @@ Please consider generating a new key file.</source>
         <translation>Απόκριση Πρόκλησης:</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Δεν είναι δυνατό να ανοίξει τη βάση δεδομένων.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Δεν είναι δυνατό να ανοίξει αρχείο κλειδιού</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation type="unfinished"/>
     </message>
@@ -754,101 +979,169 @@ Please consider generating a new key file.</source>
         <source>Select key file</source>
         <translation>Επιλέξτε αρχείο κλειδί</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>Επισκευή βάσης δεδομένων</translation>
+        <source>TouchID for quick unlock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Σφάλμα</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Δεν είναι δυνατό να ανοίξει αρχείο κλειδιού</translation>
+        <source>Can't open key file:
+%1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Δεν είναι δυνατό να ανοίξει τη βάση δεδομένων.</translation>
+        <source>Passwords</source>
+        <translation>Κωδικοί</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
+    <message>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Γενικά</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Μια χαρά το άνοιγμα βάσης δεδομένων. Τίποτα να κάνει.</translation>
+        <source>Security</source>
+        <translation>Ασφάλεια</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>Επιτυχία</translation>
+        <source>Master Key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>Η βάση δεδομένων έχει επιδιορθωθεί με επιτυχία μπορείτε να το αποθηκεύσετε τώρα.</translation>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>Δεν είναι δυνατή η επιδιόρθωση της βάσης δεδομένων.</translation>
+        <source>Browser Integration</source>
+        <translation>Ενσωμάτωση Περιηγητή</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>Γενικά</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>Κρυπτογράφηση</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Αριθμός γύρων πάρα πολύ υψηλός</translation>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation type="unfinished"/>
     </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>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Understood, keep number</source>
+        <source>Stored keys</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>Άκυρο</translation>
+        <source>Remove</source>
+        <translation>Αφαίρεση</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Αριθμός γύρων πάρα πολύ χαμηλός</translation>
+        <source>Delete the selected key?</source>
+        <translation type="unfinished"/>
     </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>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KDF unchanged</source>
+        <source>Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Δε βρεθήκαν κλειδιά</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Κλειδιά αφαιρέθηκαν από τη βάση</translation>
+    </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Διακοπή</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Δικαιώματα αφαιρέθηκαν</translation>
+    </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
+        <source>Successfully removed permissions from %n entry(s).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: Δε βρέθηκε καταχώρηση με δικαιώματα!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetEncryption</name>
@@ -884,6 +1177,109 @@ If you keep this number, your database may be too easy to crack!</source>
         <source>Parallelism:</source>
         <translation>Παραλληλισμός:</translation>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Αριθμός γύρων πάρα πολύ υψηλός</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"/>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Άκυρο</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Αριθμός γύρων πάρα πολύ χαμηλός</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"/>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -933,91 +1329,110 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>Ρίζα</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Βάση Δεδομένων KeePass 2</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Όλα τα αρχεία</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Άνοιγμα Βάσης Δεδομένων</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>Αρχείο δεν βρέθηκε!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Δεν είναι δυνατό να ανοίξει τη βάση δεδομένων.</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>Αρχείο ανοιχτό μόνο για ανάγνωση.</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>Άνοιγμα αρχείου CSV</translation>
+        <source>Add additional protection...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>αρχείο CSV</translation>
+        <source>No encryption key added</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>Όλα τα αρχεία (*)</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Συγχώνευση βάσης δεδομένων</translation>
+        <source>No password set</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Άνοιγμα βάσης δεδομένων KeePass 1</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 type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>Βάση δεδομένων KeePass 1</translation>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>Κλείσιμο;</translation>
+        <source>Failed to change master key</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; είναι σε λειτουργεία επεξεργασίας.
-Απόρριψη αλλαγών και κλείσιμο ούτως η άλλως;</translation>
+        <source>Database Name:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>Αποθήκευση αλλαγών;</translation>
+        <source>Description:</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>&quot;%1&quot; έχει τροποποιηθή.
-Αποθήκευση αλλαγών;</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Βάση Δεδομένων KeePass 2</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Εγγραφή της βάσης δεδομένων απέτυχε.</translation>
+        <source>All files</source>
+        <translation>Όλα τα αρχεία</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Κωδικοί</translation>
+        <source>Open database</source>
+        <translation>Άνοιγμα Βάσης Δεδομένων</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Αποθήκευση βάσης δεδομένων ως</translation>
+        <source>CSV file</source>
+        <translation>αρχείο CSV</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>Συγχώνευση βάσης δεδομένων</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Άνοιγμα βάσης δεδομένων KeePass 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>Βάση δεδομένων KeePass 1</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1028,38 +1443,39 @@ Save changes?</source>
         <translation>Γράψιμο στο αρχείο CSV απέτυχε.</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>Νέα Βάση Δεδομένων</translation>
+        <source>Database creation error</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
     </message>
     <message>
-        <source>locked</source>
-        <translation>κλειδωμένο</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>Κλείδωμα βάσης δεδομένων</translation>
+        <source>Select CSV file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>Η βάση δεδομένων δεν μπορεί να κλειδωθεί γιατί την επεξεργάζεται αυτην την στιγμή.
-Παρακαλώ πατήστε άκυρο για να αποθηκεύσετε τις αλλαγές σας η να τις απορρίψετε.</translation>
+        <source>New Database</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>Αυτή η βάση δεδομένων έχει αλλάξει.
-Θέλετε να αποθηκεύσετε τις αλλαγές σας πρίν την κλειδώσετε:
-Αλλιώς οι αλλαγές σας θα χαθούν.</translation>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disable safe saves?</source>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
         <translation type="unfinished"/>
     </message>
     <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>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1070,37 +1486,13 @@ Disable safe saves and try again?</source>
         <translation>Αναζήτηση...</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>Αλλαγή πρωτεύοντος κλειδιού</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>Διαγραφή καταχώρησης;</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>Θέλετε πραγματικά να διαγράψετε την καταχώρηση &quot;%1&quot; μόνιμα;</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Διαγραφή καταχωρήσεων;</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Θέλετε πραγματικά να διαγράψετε %1 καταχωρήσεις για πάντα;</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Κίνηση εισόδου στον κάδο ανακύκλωσης;</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation>Θέλετε πραγματικά να κινηθεί εισόδου &quot;%1&quot; στον κάδο ανακύκλωσης;</translation>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Μετακίνηση καταχωρήσεων στο καλάθι των αχρήστων;</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
@@ -1118,18 +1510,10 @@ Disable safe saves and try again?</source>
         <translation>Να θυμάσαι αυτή την επιλογή</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Διαγραφή ομάδας;</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>Θέλετε στα αλήθεια να διαγράψετε την ομάδα &quot;%1&quot; μόνιμα;</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Σε θέση να υπολογίσει το κύριο κλειδί</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>Καμία τρέχουσα βάση δεδομένων.</translation>
     </message>
@@ -1163,10 +1547,6 @@ Do you want to merge your changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>Δεν ήταν δυνατό το άνοιγμα του νέου αρχείου βάσης δεδομένων κατά την προσπάθεια αυτόματης επαναφόρτωσης αυτής της βάσης δεδομένων.</translation>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>Άδειασμα κάδου ανακύκλωσης;</translation>
     </message>
@@ -1174,87 +1554,102 @@ Do you want to merge your changes?</source>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>Είστε σίγουροι ότι θέλετε να διαγράψετε μόνιμα τα πάντα από το κάδο ανακύκλωσής σας;</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation type="unfinished"/>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Κλείσιμο</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Αρχείο ανοιχτό μόνο για ανάγνωση.</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Γενικά</translation>
+        <source>Lock Database?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Κωδικός</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot; έχει τροποποιηθή.
+Αποθήκευση αλλαγών;</translation>
     </message>
     <message>
-        <source>Expiration</source>
+        <source>Database was modified.
+Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Όνομα χρήστη</translation>
+        <source>Save changes?</source>
+        <translation>Αποθήκευση αλλαγών;</translation>
     </message>
     <message>
-        <source>Autotype</source>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searching</source>
+        <source>Disable safe saves?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Attributes</source>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Συνημμένα</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Σημειώσεις</translation>
+        <source>Passwords</source>
+        <translation>Κωδικοί</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>Παράθυρο</translation>
+        <source>Save database as</source>
+        <translation>Αποθήκευση βάσης δεδομένων ως</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>Ακολουθία</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Βάση Δεδομένων KeePass 2</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Αναζήτηση</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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>
     </message>
     <message>
-        <source>Clear</source>
-        <translation type="unfinished"/>
+        <source>Delete group</source>
+        <translation>Διαγραφή ομάδας</translation>
     </message>
     <message>
-        <source>Never</source>
+        <source>Move group to recycle bin?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
+        <source>Successfully merged the database files.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
+        <source>Database was not modified by merge operation.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1329,22 +1724,10 @@ Do you want to merge your changes?</source>
         <translation>Νέο χαρακτηριστικό</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Επιβεβαίωση Αφαίρεσης</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>Είστε σίγουροι ότι θέλετε να αφαιρέσετε αυτό το χαρακτηριστικό.</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>Αύριο</translation>
     </message>
@@ -1357,10 +1740,6 @@ Do you want to merge your changes?</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 χρόνο</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation type="unfinished"/>
     </message>
@@ -1372,6 +1751,26 @@ Do you want to merge your changes?</source>
         <source>Entry updated successfully.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation>[ΠΡΟΣΤΑΤΕΥΜΕΝΟ] Πατήστε αποκάλυψη για προβολή ή επεξεργασία</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1617,6 +2016,81 @@ Do you want to merge your changes?</source>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Κωδικός:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1674,10 +2148,6 @@ Do you want to merge your changes?</source>
         <translation>Αδυναμία λήψης favicon.</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Images</source>
         <translation>Εικόνες</translation>
     </message>
@@ -1686,25 +2156,45 @@ Do you want to merge your changes?</source>
         <translation>Όλα τα αρχεία</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Επιλογή εικόνας</translation>
+        <source>Custom icon already exists</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t read icon</source>
-        <translation>Αδυναμία ανάγνωσης εικονιδίου</translation>
+        <source>Confirm Delete</source>
+        <translation>Επιβεβαίωση Διαγραφής</translation>
     </message>
     <message>
-        <source>Custom icon already exists</source>
+        <source>Custom icon successfully downloaded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Confirm Delete</source>
-        <translation>Επιβεβαίωση Διαγραφής</translation>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
+        <source>Select Image(s)</source>
         <translation type="unfinished"/>
     </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>
@@ -1753,9 +2243,8 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation> - Κλωνοποίηση</translation>
+        <source>%1 - Clone</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1800,10 +2289,6 @@ This may cause the affected plugins to malfunction.</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Επιβεβαίωση Αφαίρεσης</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation type="unfinished"/>
     </message>
@@ -1836,10 +2321,14 @@ This may cause the affected plugins to malfunction.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open files:
-%1</source>
+        <source>Confirm remove</source>
         <translation type="unfinished"/>
     </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
+%1</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
 </context>
 <context>
     <name>EntryAttributesModel</name>
@@ -1922,108 +2411,166 @@ This may cause the affected plugins to malfunction.</source>
         <source>Attachments</source>
         <translation>Συνημμένα</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>EntryView</name>
+    <name>EntryPreviewWidget</name>
     <message>
-        <source>Customize View</source>
+        <source>Generate TOTP Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide Usernames</source>
+        <source>Close</source>
+        <translation>Κλείσιμο</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Γενικά</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Όνομα χρήστη</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Κωδικός</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide Passwords</source>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fit to window</source>
+        <source>Attachments</source>
+        <translation>Συνημμένα</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Σημειώσεις</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fit to contents</source>
+        <source>Window</source>
+        <translation>Παράθυρο</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Ακολουθία</translation>
+    </message>
+    <message>
+        <source>Searching</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Reset to defaults</source>
+        <source>Search</source>
+        <translation>Αναζήτηση</translation>
+    </message>
+    <message>
+        <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Attachments (icon)</source>
+        <source>Never</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Group</name>
     <message>
-        <source>Recycle Bin</source>
-        <translation>Καλάθι ανακύκλωσης</translation>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>HostInstaller</name>
     <message>
-        <source>KeePassXC: Cannot save file!</source>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot save the native messaging script file.</source>
+        <source>Enabled</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>HttpPasswordGeneratorWidget</name>
     <message>
-        <source>Length:</source>
-        <translation>Μήκος:</translation>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Character Types</source>
-        <translation>Τύποι χαρακτήρων</translation>
+        <source>Share</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>EntryView</name>
     <message>
-        <source>Upper Case Letters</source>
-        <translation>Κεφαλαία γράμματα</translation>
+        <source>Customize View</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A-Z</source>
-        <translation>Α-Ω</translation>
+        <source>Hide Usernames</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lower Case Letters</source>
-        <translation>Πεζά γράμματα</translation>
+        <source>Hide Passwords</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>a-z</source>
-        <translation>α-ω</translation>
+        <source>Fit to window</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Numbers</source>
-        <translation>Αριθμοί</translation>
+        <source>Fit to contents</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
+        <source>Reset to defaults</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Special Characters</source>
-        <translation>Ειδικοί χαρακτήρες</translation>
+        <source>Attachments (icon)</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Group</name>
     <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
+        <source>Recycle Bin</source>
+        <translation>Καλάθι ανακύκλωσης</translation>
     </message>
     <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Εξαίρεση χαρακτήρων που μοίαζουν</translation>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>HostInstaller</name>
     <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>Βεβαιωθείται οτι ο κωδικός περιέχει χαρακτήρες απο κάθε ομάδα</translation>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extended ASCII</source>
+        <source>Cannot save the native messaging script file.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -2052,6 +2599,26 @@ This may cause the affected plugins to malfunction.</source>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Λάθος κλειδί ή βάση δεδομένων αρχείο είναι κατεστραμμένο.</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2211,10 +2778,6 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation type="unfinished"/>
     </message>
@@ -2265,6 +2828,18 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Unsupported KeePass 2 database version.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2337,10 +2912,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation type="unfinished"/>
     </message>
@@ -2389,6 +2960,12 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2552,61 +3129,147 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Invalid entry field type</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <source>Disabled share</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <source>Import from</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Μία άλλη διεργασία του KeePassXC ήδη τρέχει.</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Ανεπανόρθωτο σφάλμα κατά τον έλεγχο των κρυπτογραφικών λειτουργιών.</translation>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Σφάλμα</translation>
+        <source>Key Component</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Άκυρο</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>KeyFileEditWidget</name>
     <message>
-        <source>&amp;Database</source>
-        <translation>&amp;Βάση Δεδομένων</translation>
+        <source>Browse</source>
+        <translation>Αναζήτηση</translation>
     </message>
     <message>
-        <source>&amp;Recent databases</source>
-        <translation>&amp;Πρόσφατες βάσεις δεδομένων</translation>
+        <source>Generate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Εισαγωγή</translation>
+        <source>Key File</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Help</source>
+        <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"/>
     </message>
     <message>
-        <source>E&amp;ntries</source>
-        <translation>Ε&amp;γγραφές</translation>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
+        <source>Error loading the key file '%1'
+Message: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Time-based one-time password</source>
+        <source>Key files</source>
+        <translation>Αρχεία κλειδιά</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Όλα τα αρχεία</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Δημιουργεία αρχείου κλειδιού...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Επιλέξτε ένα αρχείο κλειδί</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>&amp;Βάση Δεδομένων</translation>
+    </message>
+    <message>
+        <source>&amp;Recent databases</source>
+        <translation>&amp;Πρόσφατες βάσεις δεδομένων</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>E&amp;ntries</source>
+        <translation>Ε&amp;γγραφές</translation>
+    </message>
+    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Ομάδες</translation>
     </message>
@@ -2635,30 +3298,10 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Κλείσιμο βάσης δεδομένων</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>&amp;Νέα βάση δεδομένων</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>Συγχώνευση από βάση δεδομένων KeePassX</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>&amp;Προσθήκη νέας καταχώρησης</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>&amp;Προβολή/Επεξεργασία καταχώρησης</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>&amp;Διαγραφή καταχώρησης</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>&amp;Προσθήκη νέας ομάδας</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>&amp;Επεξεργασία ομάδας</translation>
     </message>
@@ -2671,14 +3314,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>Ρυθμίσεις βάσης δεδομένων</translation>
     </message>
@@ -2687,10 +3322,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Κλωνοποίηση καταχώρησης </translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>Αντιγραφή &amp;ονόματος χρήστη</translation>
     </message>
@@ -2699,10 +3330,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Αντιγραφή όνομα χρήστη στο πρόχειρο</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>Αντιγρα&amp;φή κωδικού </translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>Αντιγραφή κωδικού στο πρόχειρο</translation>
     </message>
@@ -2715,14 +3342,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Γεννήτρια Κωδικών</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>&amp;Άνοιγμα URL</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>&amp;Κλείδωμα βάσεων δεδομένων</translation>
     </message>
@@ -2755,309 +3374,436 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
+        <source>Set up TOTP...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import CSV file...</source>
+        <source>Copy &amp;TOTP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;pair database...</source>
+        <source>E&amp;mpty recycle bin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show TOTP</source>
+        <source>Clear history</source>
+        <translation>Καθαρισμός ιστορικού</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Σφάλματος πρόσβασης για αρχείο ρυθμίσεων %1</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Ρύθμίσεις</translation>
+    </message>
+    <message>
+        <source>Toggle window</source>
+        <translation>Εναλλαγή παραθύρων</translation>
+    </message>
+    <message>
+        <source>Quit KeePassXC</source>
+        <translation>Κλείσιμο KeePassXC</translation>
+    </message>
+    <message>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Παρακαλώ αγγίξτε το κουμπί στο YubiKey σας!</translation>
+    </message>
+    <message>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Set up TOTP...</source>
+        <source>&amp;Donate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
+        <source>Report a &amp;bug</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>E&amp;mpty recycle bin</source>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Clear history</source>
-        <translation>Καθαρισμός ιστορικού</translation>
+        <source>&amp;Import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>Σφάλματος πρόσβασης για αρχείο ρυθμίσεων %1</translation>
+        <source>Copy att&amp;ribute...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
+        <source>TOTP...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>read-only</source>
-        <translation>Μόνο για ανάγνωση</translation>
+        <source>&amp;New database...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Ρύθμίσεις</translation>
+        <source>Create a new database</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Toggle window</source>
-        <translation>Εναλλαγή παραθύρων</translation>
+        <source>&amp;Merge from database...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Quit KeePassXC</source>
-        <translation>Κλείσιμο KeePassXC</translation>
+        <source>Merge from another KDBX database</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Βάση Δεδομένων KeePass 2</translation>
+        <source>&amp;New entry</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Όλα τα αρχεία</translation>
+        <source>Add a new entry</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Άνοιγμα Βάσης Δεδομένων</translation>
+        <source>&amp;Edit entry</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Αποθήκευση επιδιορθωμένη βάση δεδομένων</translation>
+        <source>View or edit entry</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Εγγραφή της βάσης δεδομένων απέτυχε.</translation>
+        <source>&amp;New group</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Παρακαλώ αγγίξτε το κουμπί στο YubiKey σας!</translation>
+        <source>Add a new group</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
+        <source>Change master &amp;key...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>OpenSSHKey</name>
+    <name>Merger</name>
     <message>
-        <source>Invalid key file, expecting an OpenSSH key</source>
+        <source>Creating missing %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>PEM boundary mismatch</source>
+        <source>Relocating %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Base64 decoding failed</source>
+        <source>Overwriting %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key file way too small.</source>
+        <source>older entry merged from database &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key file magic header id invalid</source>
+        <source>Adding backup for older target %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Found zero keys</source>
+        <source>Adding backup for older source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to read public key.</source>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Corrupted key file, reading private key failed</source>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>No private key payload to decrypt</source>
+        <source>Synchronizing from newer source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Trying to run KDF without cipher</source>
+        <source>Synchronizing from older source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase is required to decrypt this key</source>
+        <source>Deleting child %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key derivation failed, key file corrupted?</source>
+        <source>Deleting orphan %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Decryption failed, wrong passphrase?</source>
+        <source>Changed deleted objects</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unexpected EOF while reading public key</source>
+        <source>Adding missing icon %1</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
     <message>
-        <source>Unexpected EOF while reading private key</source>
+        <source>Create a new KeePassXC database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t write public key as it is empty</source>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Ρίζα</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unexpected EOF when writing public key</source>
+        <source>En&amp;cryption Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t write private key as it is empty</source>
+        <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"/>
     </message>
     <message>
-        <source>Unexpected EOF when writing private key</source>
+        <source>Advanced Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported key type: %1</source>
+        <source>Simple Settings</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
     <message>
-        <source>Unknown cipher: %1</source>
+        <source>Encryption Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cipher IV is too short for MD5 kdf</source>
+        <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"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
     <message>
-        <source>Unknown KDF: %1</source>
+        <source>Database Master Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unknown key type: %1</source>
+        <source>A master key known only to you protects your database.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>NewDatabaseWizardPageMetaData</name>
     <message>
-        <source>Dialog</source>
-        <translation>Διάλογος</translation>
+        <source>General Database Information</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>Αυτό είναι απαραίτητο για τη πρόσβαση στις βάσεις δεδομένων σας, από το ChromeIPass ή το PassIFox</translation>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>Ενεργοποίηση του εξυπηρετητή KeePassHTTP</translation>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Γενικά</translation>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <source>Base64 decoding failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <source>Key file way too small.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return only best matching entries</source>
+        <source>Key file magic header id invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <source>Found zero keys</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
+        <source>Failed to read public key.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Match URL schemes</source>
+        <source>Corrupted key file, reading private key failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
+        <source>No private key payload to decrypt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
+        <source>Trying to run KDF without cipher</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
+        <source>Passphrase is required to decrypt this key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <source>Key derivation failed, key file corrupted?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>Γεννήτρια Κωδικών</translation>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Για προχωρημένους</translation>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
+        <source>Unexpected EOF while reading private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
+        <source>Can&apos;t write public key as it is empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only the selected database has to be connected with a client.</source>
+        <source>Unexpected EOF when writing public key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <source>Can&apos;t write private key as it is empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
+        <source>Unexpected EOF when writing private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <source>Unsupported key type: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP Θύρα:</translation>
+        <source>Unknown cipher: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Προεπιλεγμένη θύρα: 19455</translation>
+        <source>Cipher IV is too short for MD5 kdf</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>Το KeePassXC θα ακούει σε αυτή τη θύρα στο 127.0.0.1</translation>
+        <source>Unknown KDF: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <source>Unknown key type: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PasswordEditWidget</name>
+    <message>
+        <source>Enter password:</source>
+        <translation>Εισάγετε κωδικό:</translation>
+    </message>
+    <message>
+        <source>Confirm password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <source>Password</source>
+        <translation>Κωδικός</translation>
+    </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"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
+        <source>Password cannot be empty.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
+        <source>Passwords do not match.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate master password</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -3129,18 +3875,10 @@ Using default port 19455.</source>
         <translation>Λίστα Λέξεων:</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Αριθμός Λέξεων:</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>Διαχωριστικό Λέξεων:</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Αντιγραφή</translation>
     </message>
@@ -3153,10 +3891,6 @@ Using default port 19455.</source>
         <translation>Κλείσιμο</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>Εφαρμογή</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation type="unfinished"/>
     </message>
@@ -3184,51 +3918,200 @@ Using default port 19455.</source>
         <comment>Password quality</comment>
         <translation>Εξαιρετική</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Για προχωρημένους</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>Α-Ω</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>α-ω</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>QObject</name>
+    <name>QApplication</name>
     <message>
-        <source>Database not opened</source>
+        <source>KeeShare</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>QFileDialog</name>
     <message>
-        <source>Database hash not available</source>
+        <source>Select</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>QMessageBox</name>
     <message>
-        <source>Client public key not received</source>
+        <source>Overwrite</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot decrypt message</source>
+        <source>Delete</source>
+        <translation>Διαγραφή</translation>
+    </message>
+    <message>
+        <source>Move</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
+        <source>Empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Action cancelled or denied</source>
+        <source>Remove</source>
+        <translation>Αφαίρεση</translation>
+    </message>
+    <message>
+        <source>Skip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <source>Disable</source>
+        <translation>Απενεργοποίηση</translation>
+    </message>
+    <message>
+        <source>Merge</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>KeePassXC association failed, try again</source>
+        <source>Database not opened</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database hash not available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key change was not successful</source>
+        <source>Client public key not received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Encryption key is not recognized</source>
+        <source>Cannot decrypt message</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Action cancelled or denied</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>No saved databases found</source>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -3357,10 +4240,6 @@ Using default port 19455.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3439,12 +4318,6 @@ Available commands:
         <translation>σφάλμα κατά την ανάγνωση από συσκευή</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>αρχείο κενό !
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation type="unfinished"/>
     </message>
@@ -3453,6 +4326,371 @@ Available commands:
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Group</source>
+        <translation>Όμαδα</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Τίτλος</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Όνομα χρήστη</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Κωδικός</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Σημειώσεις</translation>
+    </message>
+    <message>
+        <source>Last Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation>Ενσωμάτωση Περιηγητή</translation>
+    </message>
+    <message>
+        <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Press</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation>πράκτορας SSH</translation>
+    </message>
+    <message>
+        <source>Generate a new random diceware passphrase.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word count for the diceware passphrase.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wordlist for the diceware generator.
+[Default: EFF English]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new random password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>AES: 256-bit</source>
         <translation type="unfinished"/>
     </message>
@@ -3477,100 +4715,113 @@ Available commands:
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Group</source>
-        <translation>Όμαδα</translation>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Title</source>
-        <translation>Τίτλος</translation>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Όνομα χρήστη</translation>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Κωδικός</translation>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Σημειώσεις</translation>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Last Modified</source>
+        <source>File %1 already exists.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Created</source>
+        <source>Loading the key file failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
+        <source>No key is set. Aborting database creation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Browser Integration</source>
-        <translation>Ενσωμάτωση Περιηγητή</translation>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
+        <source>Successfully created new database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Press</source>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passive</source>
+        <source>Creating KeyFile %1 failed: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>SSH Agent</source>
-        <translation>πράκτορας SSH</translation>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Generate a new random diceware passphrase.</source>
+        <source>Remove an entry from the database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word count for the diceware passphrase.</source>
+        <source>Path of the entry to remove.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>count</source>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist for the diceware generator.
-[Default: EFF English]</source>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Generate a new random password.</source>
+        <source>KeePassXC - cross-platform password manager</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Length of the generated password.</source>
-        <translation type="unfinished"/>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>ονόματα αρχείων των βάσεων δεδομένων κωδικών προς άνοιγμα (*.kdbx)</translation>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
-        <translation type="unfinished"/>
+        <source>path to a custom config file</source>
+        <translation>διαδρομή σε προσαρμοσμένο αρχείο ρυθμίσεων</translation>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
-        <translation type="unfinished"/>
+        <source>key file of the database</source>
+        <translation>Αρχείο κλειδί της βάσεως δεδομένων</translation>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
-        <translation type="unfinished"/>
+        <source>read password of the database from stdin</source>
+        <translation>Διάβασμα κωδικού βάσης από το stdin</translation>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
+        <source>Parent window handle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Μία άλλη διεργασία του KeePassXC ήδη τρέχει.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Ανεπανόρθωτο σφάλμα κατά τον έλεγχο των κρυπτογραφικών λειτουργιών.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Σφάλμα</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -3609,324 +4860,416 @@ Available commands:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
     <message>
-        <source>Search...</source>
-        <translation>Αναζήτηση...</translation>
+        <source>Agent connection failed.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Αναζήτηση</translation>
+        <source>Agent protocol error.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear</source>
+        <source>No agent running, cannot add identity.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Case Sensitive</source>
+        <source>No agent running, cannot remove identity.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Limit search to selected group</source>
-        <translation>Περιορισμός αναζήτησης στην επιλεγμένη ομάδα</translation>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Service</name>
     <message>
-        <source>KeePassXC: New key association request</source>
+        <source>The key has already been added.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: Αντικατάσταση τρέχοντος κλειδιού;</translation>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
+        <source>Search Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: Ενημέρωση Καταχώρησης</translation>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
+        <source>Every search term must match (ie, logical AND)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Βάση δεδομένων κλειδωμένη!</translation>
+        <source>Modifiers</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
+        <source>exclude term from results</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Κλειδιά αφαιρέθηκαν από τη βάση</translation>
+        <source>match term exactly</source>
+        <translation type="unfinished"/>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    <message>
+        <source>use regex in term</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Δε βρεθήκαν κλειδιά</translation>
+        <source>Fields</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <source>Term Wildcards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Ρυθμισμένες μη διαθέσιμες!</translation>
+        <source>match anything</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <source>match one</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>Αφαίρεση αποθηκευμένων δικαιωμάτων...</translation>
+        <source>logical OR</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>Διακοπή</translation>
+        <source>Examples</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SearchWidget</name>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Δικαιώματα αφαιρέθηκαν</translation>
+        <source>Search</source>
+        <translation>Αναζήτηση</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Δε βρέθηκε καταχώρηση με δικαιώματα!</translation>
+        <source>Limit search to selected group</source>
+        <translation>Περιορισμός αναζήτησης στην επιλεγμένη ομάδα</translation>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
+        <source>Search Help</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation>Διάκριση πεζών-κεφαλαίων</translation>
+    </message>
 </context>
 <context>
-    <name>SettingsWidget</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>Application Settings</source>
-        <translation>Ρυθμίσεις Εφαρμογής</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Γενικά</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>Ασφάλεια</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>Σφάλματος πρόσβασης για αρχείο ρυθμίσεων %1</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>Βασικές Ρυθμίσεις</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
+        <source>Certificate:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>Θυμηθείτε την τελευταία βάσεις δεδομένων</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
+        <source>Key:</source>
+        <translation>Κλειδί:</translation>
+    </message>
+    <message>
+        <source>Generate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Φόρτωμα προηγούμενων βάσεων δεδομένων κατά την εκκίνηση</translation>
+        <source>Import</source>
+        <translation>Εισαγωγή</translation>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>Αυτόματη αποθήκευση κατα την έξοδο</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>Αυτόματη Αποθήκευση μετά απο κάθε αλλαγή</translation>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Αυτόματη επαναφόρτωση βάσης σε περίπτωση εξωτερικής τροποποίησης</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>Ελαχιστοποίηση οταν αντιγράφετε στο πρόχειρο</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Ελαχιστοποίηση παραθύρου κατά την εκκίνηση</translation>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>Χρησιμοποίηση εικονιδίου ομάδας κατα την δημιουργία καταχώρησης</translation>
+        <source>Remove</source>
+        <translation>Αφαίρεση</translation>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <source>Path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
+        <source>Status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>Δείχνουν ένα εικονίδιο του δίσκου συστήματος</translation>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
+        <source>Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
+        <source>Trusted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
+        <source>Untrusted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Γλώσσα</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Αυτόματη-Γραφή</translation>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
+        <source>KeeShare key file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
+        <source>All files</source>
+        <translation>Όλα τα αρχεία</translation>
+    </message>
+    <message>
+        <source>Select path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation>Πάντα ερώτηση για την εκτέλεση του Auto-Type</translation>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
+        <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"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>Καθυστέρηση Auto-Type</translation>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation> ms</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
+        <source>Import from container with certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
+        <source>Not this time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
+        <source>Never</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Γενικά</translation>
+        <source>Always</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
+        <source>Just this time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>Εκκαθάριση πρόχειρου μετά από</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>δευτερόλεπτα</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>Κλείδωμα βάσης δεδομένων μετα απο ανενεργεία </translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Ευκολία</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Κλείδωμα βάσεων δεδομένων κατά το κλείδωμα της συνεδρίας ή την αναδίπλωση της οθόνης</translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>Κλείδωμα της βάσης δεδομένων μετά την ελαχιστοποίηση του παραθύρου</translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
+        <source>Untrusted import prevented</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Εμφάνιση κωδίκων σε απλό κείμενο από προεπιλογή</translation>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
+        <source>Unexpected error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide entry notes by default</source>
+        <source>Unsigned share container are not supported - import prevented</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Privacy</source>
+        <source>Successful unsigned import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>Χρήση Google ως εφεδρικό τρόπο κατεβάσματος εικονιδίων ιστοσελίδων</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpDialog</name>
+    <message>
+        <source>Timed Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>000000</source>
+        <translation>000000</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Αντιγραφή</translation>
+    </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
+    <message>
+        <source>Copy</source>
+        <translation>Αντιγραφή</translation>
+    </message>
+    <message>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>There was an error creating the QR code.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Closing in %1 seconds.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation type="unfinished"/>
@@ -3948,59 +5291,84 @@ Please unlock the selected database or choose another one which is unlocked.</so
         <translation>Χρήση προσαρμοσμένων ρυθμίσεων</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>Σημείωση: Αλλάξτε αυτές τις ρυθμίσεις μόνο εάν ξέρετε τι κάνετε.</translation>
+        <source>Custom Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Time step:</source>
         <translation>Βήμα χρόνου:</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8 Ψηφία</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>δευτερόλεπτα</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>Μέγεθος κώδικα:</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6 Ψηφία</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>Μέγεθος κώδικα:</translation>
+        <source>7 digits</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>δευτερόλεπτα</translation>
+        <source>8 digits</source>
+        <translation>8 Ψηφία</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
+        <source>Checking for updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Αντιγραφή</translation>
+        <source>Close</source>
+        <translation>Κλείσιμο</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>Λήγει σε</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>δευτερόλεπτα</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>Ξεκλείδωμα βάσης δεδομένων</translation>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4035,41 +5403,25 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
 </context>
 <context>
-    <name>main</name>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>Remove an entry from the database.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>Διαδρομή της βάσης δεδομένων.</translation>
+        <source>Refresh</source>
+        <translation>Ανανέωση</translation>
     </message>
     <message>
-        <source>Path of the entry to remove.</source>
+        <source>YubiKey Challenge-Response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - cross-platform password manager</source>
+        <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"/>
     </message>
     <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>ονόματα αρχείων των βάσεων δεδομένων κωδικών προς άνοιγμα (*.kdbx)</translation>
-    </message>
-    <message>
-        <source>path to a custom config file</source>
-        <translation>διαδρομή σε προσαρμοσμένο αρχείο ρυθμίσεων</translation>
-    </message>
-    <message>
-        <source>key file of the database</source>
-        <translation>Αρχείο κλειδί της βάσεως δεδομένων</translation>
-    </message>
-    <message>
-        <source>read password of the database from stdin</source>
-        <translation>Διάβασμα κωδικού βάσης από το stdin</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Parent window handle</source>
+        <source>No YubiKey inserted.</source>
         <translation type="unfinished"/>
     </message>
 </context>
diff --git a/share/translations/keepassx_en.ts b/share/translations/keepassx_en.ts
index ec50f7b37..2cfb15456 100644
--- a/share/translations/keepassx_en.ts
+++ b/share/translations/keepassx_en.ts
@@ -1,850 +1,902 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="en_US">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="en" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
         <source>About KeePassXC</source>
-        <translation type="unfinished"></translation>
+        <translation>About KeePassXC</translation>
     </message>
     <message>
         <source>About</source>
-        <translation type="unfinished"></translation>
+        <translation>About</translation>
     </message>
     <message>
         <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
     </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>
+        <translation>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</translation>
     </message>
     <message>
         <source>Contributors</source>
-        <translation type="unfinished"></translation>
+        <translation>Contributors</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>
-        <translation type="unfinished"></translation>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</translation>
     </message>
     <message>
         <source>Debug Info</source>
-        <translation type="unfinished"></translation>
+        <translation>Debug Info</translation>
     </message>
     <message>
         <source>Include the following information whenever you report a bug:</source>
-        <translation type="unfinished"></translation>
+        <translation>Include the following information whenever you report a bug:</translation>
     </message>
     <message>
         <source>Copy to clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Copy to clipboard</translation>
     </message>
     <message>
         <source>Revision: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Revision: %1</translation>
     </message>
     <message>
         <source>Distribution: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Distribution: %1</translation>
     </message>
     <message>
         <source>Libraries:</source>
-        <translation type="unfinished"></translation>
+        <translation>Libraries:</translation>
     </message>
     <message>
         <source>Operating system: %1
 CPU architecture: %2
 Kernel: %3 %4</source>
-        <translation type="unfinished"></translation>
+        <translation>Operating system: %1
+CPU architecture: %2
+Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Enabled extensions:</source>
-        <translation type="unfinished"></translation>
+        <translation>Enabled extensions:</translation>
     </message>
     <message>
         <source>Project Maintainers:</source>
-        <translation type="unfinished"></translation>
+        <translation>Project Maintainers:</translation>
     </message>
     <message>
         <source>Special thanks from the KeePassXC team go to debfx for creating the original KeePassX.</source>
-        <translation type="unfinished"></translation>
+        <translation>Special thanks from the KeePassXC team go to debfx for creating the original KeePassX.</translation>
     </message>
     <message>
         <source>Version %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Version %1</translation>
     </message>
     <message>
         <source>Build Type: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Build Type: %1</translation>
     </message>
     <message>
         <source>Auto-Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Auto-Type</translation>
     </message>
     <message>
         <source>Browser Integration</source>
-        <translation type="unfinished"></translation>
+        <translation>Browser Integration</translation>
     </message>
     <message>
         <source>SSH Agent</source>
-        <translation type="unfinished"></translation>
+        <translation>SSH Agent</translation>
     </message>
     <message>
         <source>YubiKey</source>
-        <translation type="unfinished"></translation>
+        <translation>YubiKey</translation>
     </message>
     <message>
         <source>TouchID</source>
-        <translation type="unfinished"></translation>
+        <translation>TouchID</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>None</translation>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation>KeeShare (signed and unsigned sharing)</translation>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation>KeeShare (only signed sharing)</translation>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation>KeeShare (only unsigned sharing)</translation>
     </message>
 </context>
 <context>
     <name>AgentSettingsWidget</name>
     <message>
         <source>Enable SSH Agent (requires restart)</source>
-        <translation type="unfinished"></translation>
+        <translation>Enable SSH Agent (requires restart)</translation>
+    </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation>Use OpenSSH for Windows instead of Pageant</translation>
     </message>
 </context>
 <context>
     <name>ApplicationSettingsWidget</name>
     <message>
         <source>Application Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Application Settings</translation>
     </message>
     <message>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>General</translation>
     </message>
     <message>
         <source>Security</source>
-        <translation type="unfinished"></translation>
+        <translation>Security</translation>
     </message>
     <message>
         <source>Access error for config file %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Access error for config file %1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation>Icon only</translation>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation>Text only</translation>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation>Text beside icon</translation>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation>Text under icon</translation>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation>Follow style</translation>
     </message>
 </context>
 <context>
     <name>ApplicationSettingsWidgetGeneral</name>
     <message>
         <source>Basic Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Basic Settings</translation>
     </message>
     <message>
         <source>Startup</source>
-        <translation type="unfinished"></translation>
+        <translation>Startup</translation>
     </message>
     <message>
         <source>Start only a single instance of KeePassXC</source>
-        <translation type="unfinished"></translation>
+        <translation>Start only a single instance of KeePassXC</translation>
     </message>
     <message>
         <source>Remember last databases</source>
-        <translation type="unfinished"></translation>
+        <translation>Remember last databases</translation>
     </message>
     <message>
         <source>Remember last key files and security dongles</source>
-        <translation type="unfinished"></translation>
+        <translation>Remember last key files and security dongles</translation>
     </message>
     <message>
         <source>Load previous databases on startup</source>
-        <translation type="unfinished"></translation>
+        <translation>Load previous databases on startup</translation>
     </message>
     <message>
         <source>Minimize window at application startup</source>
-        <translation type="unfinished"></translation>
+        <translation>Minimize window at application startup</translation>
     </message>
     <message>
         <source>File Management</source>
-        <translation type="unfinished"></translation>
+        <translation>File Management</translation>
     </message>
     <message>
         <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation type="unfinished"></translation>
+        <translation>Safely save database files (may be incompatible with Dropbox, etc)</translation>
     </message>
     <message>
         <source>Backup database file before saving</source>
-        <translation type="unfinished"></translation>
+        <translation>Backup database file before saving</translation>
     </message>
     <message>
         <source>Automatically save after every change</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatically save after every change</translation>
     </message>
     <message>
         <source>Automatically save on exit</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatically save on exit</translation>
     </message>
     <message>
         <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation type="unfinished"></translation>
+        <translation>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</translation>
     </message>
     <message>
         <source>Automatically reload the database when modified externally</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatically reload the database when modified externally</translation>
     </message>
     <message>
         <source>Entry Management</source>
-        <translation type="unfinished"></translation>
+        <translation>Entry Management</translation>
     </message>
     <message>
         <source>Use group icon on entry creation</source>
-        <translation type="unfinished"></translation>
+        <translation>Use group icon on entry creation</translation>
     </message>
     <message>
         <source>Minimize when copying to clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Minimize when copying to clipboard</translation>
     </message>
     <message>
         <source>Hide the entry preview panel</source>
-        <translation type="unfinished"></translation>
+        <translation>Hide the entry preview panel</translation>
     </message>
     <message>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>General</translation>
     </message>
     <message>
         <source>Hide toolbar (icons)</source>
-        <translation type="unfinished"></translation>
+        <translation>Hide toolbar (icons)</translation>
     </message>
     <message>
         <source>Minimize instead of app exit</source>
-        <translation type="unfinished"></translation>
+        <translation>Minimize instead of app exit</translation>
     </message>
     <message>
         <source>Show a system tray icon</source>
-        <translation type="unfinished"></translation>
+        <translation>Show a system tray icon</translation>
     </message>
     <message>
         <source>Dark system tray icon</source>
-        <translation type="unfinished"></translation>
+        <translation>Dark system tray icon</translation>
     </message>
     <message>
         <source>Hide window to system tray when minimized</source>
-        <translation type="unfinished"></translation>
+        <translation>Hide window to system tray when minimized</translation>
     </message>
     <message>
         <source>Language</source>
-        <translation type="unfinished"></translation>
+        <translation>Language</translation>
     </message>
     <message>
         <source>Auto-Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Auto-Type</translation>
     </message>
     <message>
         <source>Use entry title to match windows for global Auto-Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Use entry title to match windows for global Auto-Type</translation>
     </message>
     <message>
         <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Use entry URL to match windows for global Auto-Type</translation>
     </message>
     <message>
         <source>Always ask before performing Auto-Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Always ask before performing Auto-Type</translation>
     </message>
     <message>
         <source>Global Auto-Type shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>Global Auto-Type shortcut</translation>
     </message>
     <message>
         <source>Auto-Type typing delay</source>
-        <translation type="unfinished"></translation>
+        <translation>Auto-Type typing delay</translation>
     </message>
     <message>
         <source> ms</source>
         <comment>Milliseconds</comment>
-        <translation type="unfinished"></translation>
+        <translation> ms</translation>
     </message>
     <message>
         <source>Auto-Type start delay</source>
-        <translation type="unfinished"></translation>
+        <translation>Auto-Type start delay</translation>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation>Check for updates at application startup</translation>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation>Include pre-releases when checking for updates</translation>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation>Movable toolbar</translation>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation>Button style</translation>
     </message>
 </context>
 <context>
     <name>ApplicationSettingsWidgetSecurity</name>
     <message>
         <source>Timeouts</source>
-        <translation type="unfinished"></translation>
+        <translation>Timeouts</translation>
     </message>
     <message>
         <source>Clear clipboard after</source>
-        <translation type="unfinished"></translation>
+        <translation>Clear clipboard after</translation>
     </message>
     <message>
         <source> sec</source>
         <comment>Seconds</comment>
-        <translation type="unfinished"></translation>
+        <translation> sec</translation>
     </message>
     <message>
         <source>Lock databases after inactivity of</source>
-        <translation type="unfinished"></translation>
+        <translation>Lock databases after inactivity of</translation>
     </message>
     <message>
         <source> min</source>
-        <translation type="unfinished"></translation>
+        <translation> min</translation>
     </message>
     <message>
         <source>Forget TouchID after inactivity of</source>
-        <translation type="unfinished"></translation>
+        <translation>Forget TouchID after inactivity of</translation>
     </message>
     <message>
         <source>Convenience</source>
-        <translation type="unfinished"></translation>
+        <translation>Convenience</translation>
     </message>
     <message>
         <source>Lock databases when session is locked or lid is closed</source>
-        <translation type="unfinished"></translation>
+        <translation>Lock databases when session is locked or lid is closed</translation>
     </message>
     <message>
         <source>Forget TouchID when session is locked or lid is closed</source>
-        <translation type="unfinished"></translation>
+        <translation>Forget TouchID when session is locked or lid is closed</translation>
     </message>
     <message>
         <source>Lock databases after minimizing the window</source>
-        <translation type="unfinished"></translation>
+        <translation>Lock databases after minimizing the window</translation>
     </message>
     <message>
         <source>Re-lock previously locked database after performing Auto-Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Re-lock previously locked database after performing Auto-Type</translation>
     </message>
     <message>
         <source>Don&apos;t require password repeat when it is visible</source>
-        <translation type="unfinished"></translation>
+        <translation>Don&apos;t require password repeat when it is visible</translation>
     </message>
     <message>
         <source>Don&apos;t hide passwords when editing them</source>
-        <translation type="unfinished"></translation>
+        <translation>Don&apos;t hide passwords when editing them</translation>
     </message>
     <message>
         <source>Don&apos;t use placeholder for empty password fields</source>
-        <translation type="unfinished"></translation>
+        <translation>Don&apos;t use placeholder for empty password fields</translation>
     </message>
     <message>
         <source>Hide passwords in the entry preview panel</source>
-        <translation type="unfinished"></translation>
+        <translation>Hide passwords in the entry preview panel</translation>
     </message>
     <message>
         <source>Hide entry notes by default</source>
-        <translation type="unfinished"></translation>
+        <translation>Hide entry notes by default</translation>
     </message>
     <message>
         <source>Privacy</source>
-        <translation type="unfinished"></translation>
+        <translation>Privacy</translation>
     </message>
     <message>
         <source>Use DuckDuckGo as fallback for downloading website icons</source>
-        <translation type="unfinished"></translation>
+        <translation>Use DuckDuckGo as fallback for downloading website icons</translation>
     </message>
 </context>
 <context>
     <name>AutoType</name>
     <message>
         <source>Couldn&apos;t find an entry that matches the window title:</source>
-        <translation type="unfinished"></translation>
+        <translation>Couldn&apos;t find an entry that matches the window title:</translation>
     </message>
     <message>
         <source>Auto-Type - KeePassXC</source>
-        <translation type="unfinished"></translation>
+        <translation>Auto-Type - KeePassXC</translation>
     </message>
     <message>
         <source>Auto-Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Auto-Type</translation>
     </message>
     <message>
         <source>The Syntax of your Auto-Type statement is incorrect!</source>
-        <translation type="unfinished"></translation>
+        <translation>The Syntax of your Auto-Type statement is incorrect!</translation>
     </message>
     <message>
         <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
-        <translation type="unfinished"></translation>
+        <translation>This Auto-Type command contains a very long delay. Do you really want to proceed?</translation>
     </message>
     <message>
         <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
-        <translation type="unfinished"></translation>
+        <translation>This Auto-Type command contains very slow key presses. Do you really want to proceed?</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>
+        <translation>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</translation>
     </message>
 </context>
 <context>
     <name>AutoTypeAssociationsModel</name>
     <message>
         <source>Window</source>
-        <translation type="unfinished"></translation>
+        <translation>Window</translation>
     </message>
     <message>
         <source>Sequence</source>
-        <translation type="unfinished"></translation>
+        <translation>Sequence</translation>
     </message>
     <message>
         <source>Default sequence</source>
-        <translation type="unfinished"></translation>
+        <translation>Default sequence</translation>
     </message>
 </context>
 <context>
     <name>AutoTypeMatchModel</name>
     <message>
         <source>Group</source>
-        <translation type="unfinished"></translation>
+        <translation>Group</translation>
     </message>
     <message>
         <source>Title</source>
-        <translation type="unfinished"></translation>
+        <translation>Title</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished"></translation>
+        <translation>Username</translation>
     </message>
     <message>
         <source>Sequence</source>
-        <translation type="unfinished"></translation>
+        <translation>Sequence</translation>
     </message>
 </context>
 <context>
     <name>AutoTypeSelectDialog</name>
     <message>
         <source>Auto-Type - KeePassXC</source>
-        <translation type="unfinished"></translation>
+        <translation>Auto-Type - KeePassXC</translation>
     </message>
     <message>
         <source>Select entry to Auto-Type:</source>
-        <translation type="unfinished"></translation>
+        <translation>Select entry to Auto-Type:</translation>
     </message>
 </context>
 <context>
     <name>BrowserAccessControlDialog</name>
     <message>
         <source>KeePassXC-Browser Confirm Access</source>
-        <translation type="unfinished"></translation>
+        <translation>KeePassXC-Browser Confirm Access</translation>
     </message>
     <message>
         <source>Remember this decision</source>
-        <translation type="unfinished"></translation>
+        <translation>Remember this decision</translation>
     </message>
     <message>
         <source>Allow</source>
-        <translation type="unfinished"></translation>
+        <translation>Allow</translation>
     </message>
     <message>
         <source>Deny</source>
-        <translation type="unfinished"></translation>
+        <translation>Deny</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>
+        <translation>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</translation>
     </message>
 </context>
 <context>
     <name>BrowserEntrySaveDialog</name>
     <message>
         <source>KeePassXC-Browser Save Entry</source>
-        <translation type="unfinished"></translation>
+        <translation>KeePassXC-Browser Save Entry</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Cancel</translation>
     </message>
     <message>
         <source>You have multiple databases open.
 Please select the correct database for saving credentials.</source>
-        <translation type="unfinished"></translation>
+        <translation>You have multiple databases open.
+Please select the correct database for saving credentials.</translation>
     </message>
 </context>
 <context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Dialog</translation>
     </message>
     <message>
         <source>This is required for accessing your databases with KeePassXC-Browser</source>
-        <translation type="unfinished"></translation>
+        <translation>This is required for accessing your databases with KeePassXC-Browser</translation>
     </message>
     <message>
         <source>Enable KeepassXC browser integration</source>
-        <translation type="unfinished"></translation>
+        <translation>Enable KeepassXC browser integration</translation>
     </message>
     <message>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>General</translation>
     </message>
     <message>
         <source>Enable integration for these browsers:</source>
-        <translation type="unfinished"></translation>
+        <translation>Enable integration for these browsers:</translation>
     </message>
     <message>
         <source>&amp;Google Chrome</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Google Chrome</translation>
     </message>
     <message>
         <source>&amp;Firefox</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Firefox</translation>
     </message>
     <message>
         <source>&amp;Chromium</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Chromium</translation>
     </message>
     <message>
         <source>&amp;Vivaldi</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Vivaldi</translation>
     </message>
     <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>
+        <translation>Show a &amp;notification when credentials are requested</translation>
     </message>
     <message>
         <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation type="unfinished"></translation>
+        <translation>Re&amp;quest to unlock the database if it is locked</translation>
     </message>
     <message>
         <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
-        <translation type="unfinished"></translation>
+        <translation>Only entries with the same scheme (http://, https://, ...) are returned.</translation>
     </message>
     <message>
         <source>&amp;Match URL scheme (e.g., https://...)</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Match URL scheme (e.g., https://...)</translation>
     </message>
     <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation type="unfinished"></translation>
+        <translation>Only returns the best matches for a specific URL instead of all entries for the whole domain.</translation>
     </message>
     <message>
         <source>&amp;Return only best-matching credentials</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Return only best-matching credentials</translation>
     </message>
     <message>
         <source>Sort &amp;matching credentials by title</source>
         <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Sort &amp;matching credentials by title</translation>
     </message>
     <message>
         <source>Sort matching credentials by &amp;username</source>
         <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Sort matching credentials by &amp;username</translation>
     </message>
     <message>
         <source>Advanced</source>
-        <translation type="unfinished"></translation>
+        <translation>Advanced</translation>
     </message>
     <message>
         <source>Never &amp;ask before accessing credentials</source>
         <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Never &amp;ask before accessing credentials</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>
+        <translation>Never ask before &amp;updating credentials</translation>
     </message>
     <message>
         <source>Only the selected database has to be connected with a client.</source>
-        <translation type="unfinished"></translation>
+        <translation>Only the selected database has to be connected with a client.</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>
+        <translation>Searc&amp;h in all opened databases for matching credentials</translation>
     </message>
     <message>
         <source>Automatically creating or updating string fields is not supported.</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatically creating or updating string fields is not supported.</translation>
     </message>
     <message>
         <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Return advanced string fields which start with &quot;KPH: &quot;</translation>
     </message>
     <message>
         <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
-        <translation type="unfinished"></translation>
+        <translation>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</translation>
     </message>
     <message>
         <source>Update &amp;native messaging manifest files at startup</source>
-        <translation type="unfinished"></translation>
+        <translation>Update &amp;native messaging manifest files at startup</translation>
     </message>
     <message>
         <source>Support a proxy application between KeePassXC and browser extension.</source>
-        <translation type="unfinished"></translation>
+        <translation>Support a proxy application between KeePassXC and browser extension.</translation>
     </message>
     <message>
         <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
-        <translation type="unfinished"></translation>
+        <translation>Use a &amp;proxy application between KeePassXC and browser extension</translation>
     </message>
     <message>
         <source>Use a custom proxy location if you installed a proxy manually.</source>
-        <translation type="unfinished"></translation>
+        <translation>Use a custom proxy location if you installed a proxy manually.</translation>
     </message>
     <message>
         <source>Use a &amp;custom proxy location</source>
         <comment>Meant is the proxy for KeePassXC-Browser</comment>
-        <translation type="unfinished"></translation>
+        <translation>Use a &amp;custom proxy location</translation>
     </message>
     <message>
         <source>Browse...</source>
         <extracomment>Button for opening file dialog</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Browse...</translation>
     </message>
     <message>
         <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</translation>
     </message>
     <message>
         <source>Select custom proxy location</source>
-        <translation type="unfinished"></translation>
+        <translation>Select custom proxy location</translation>
     </message>
     <message>
         <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
-        <translation type="unfinished"></translation>
+        <translation>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</translation>
     </message>
     <message>
         <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</translation>
     </message>
     <message>
         <source>&amp;Tor Browser</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Tor Browser</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: </source>
-        <translation type="unfinished"></translation>
+        <translation>&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: </translation>
     </message>
     <message>
         <source>Executable Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Executable Files</translation>
     </message>
     <message>
         <source>All Files</source>
-        <translation type="unfinished"></translation>
+        <translation>All Files</translation>
+    </message>
+    <message>
+        <source>Do not ask permission for HTTP &amp;Basic Auth</source>
+        <extracomment>An extra HTTP Basic Auth setting</extracomment>
+        <translation>Do not ask permission for HTTP &amp;Basic Auth</translation>
     </message>
 </context>
 <context>
     <name>BrowserService</name>
     <message>
         <source>KeePassXC: New key association request</source>
-        <translation type="unfinished"></translation>
+        <translation>KeePassXC: New key association request</translation>
     </message>
     <message>
         <source>You have received an association request for the above key.
 
 If you would like to allow it access to your KeePassXC database,
 give it a unique name to identify and accept it.</source>
-        <translation type="unfinished"></translation>
+        <translation>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</translation>
     </message>
     <message>
         <source>Save and allow access</source>
-        <translation type="unfinished"></translation>
+        <translation>Save and allow access</translation>
     </message>
     <message>
         <source>KeePassXC: Overwrite existing key?</source>
-        <translation type="unfinished"></translation>
+        <translation>KeePassXC: Overwrite existing key?</translation>
     </message>
     <message>
         <source>A shared encryption key with the name &quot;%1&quot; already exists.
 Do you want to overwrite it?</source>
-        <translation type="unfinished"></translation>
+        <translation>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</translation>
     </message>
     <message>
         <source>KeePassXC: Update Entry</source>
-        <translation type="unfinished"></translation>
+        <translation>KeePassXC: Update Entry</translation>
     </message>
     <message>
         <source>Do you want to update the information in %1 - %2?</source>
-        <translation type="unfinished"></translation>
+        <translation>Do you want to update the information in %1 - %2?</translation>
     </message>
     <message>
         <source>Abort</source>
-        <translation type="unfinished"></translation>
+        <translation>Abort</translation>
     </message>
     <message>
         <source>Converting attributes to custom data…</source>
-        <translation type="unfinished"></translation>
+        <translation>Converting attributes to custom data…</translation>
     </message>
     <message>
         <source>KeePassXC: Converted KeePassHTTP attributes</source>
-        <translation type="unfinished"></translation>
+        <translation>KeePassXC: Converted KeePassHTTP attributes</translation>
     </message>
     <message>
         <source>Successfully converted attributes from %1 entry(s).
 Moved %2 keys to custom data.</source>
-        <translation type="unfinished"></translation>
+        <translation>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</translation>
     </message>
     <message numerus="yes">
         <source>Successfully moved %n keys to custom data.</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation><numerusform>Successfully moved %n keys to custom data.</numerusform><numerusform>Successfully moved %n keys to custom data.</numerusform></translation>
     </message>
     <message>
         <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
-        <translation type="unfinished"></translation>
+        <translation>KeePassXC: No entry with KeePassHTTP attributes found!</translation>
     </message>
     <message>
         <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
-        <translation type="unfinished"></translation>
+        <translation>The active database does not contain an entry with KeePassHTTP attributes.</translation>
     </message>
     <message>
         <source>KeePassXC: Legacy browser integration settings detected</source>
-        <translation type="unfinished"></translation>
+        <translation>KeePassXC: Legacy browser integration settings detected</translation>
     </message>
     <message>
         <source>Legacy browser integration settings have been detected.
 Do you want to upgrade the settings to the latest standard?
 This is necessary to maintain compatibility with the browser plugin.</source>
-        <translation type="unfinished"></translation>
+        <translation>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</translation>
     </message>
 </context>
 <context>
     <name>CloneDialog</name>
     <message>
         <source>Clone Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Clone Options</translation>
     </message>
     <message>
         <source>Append &apos; - Clone&apos; to title</source>
-        <translation type="unfinished"></translation>
+        <translation>Append &apos; - Clone&apos; to title</translation>
     </message>
     <message>
         <source>Replace username and password with references</source>
-        <translation type="unfinished"></translation>
+        <translation>Replace username and password with references</translation>
     </message>
     <message>
         <source>Copy history</source>
-        <translation type="unfinished"></translation>
+        <translation>Copy history</translation>
     </message>
 </context>
 <context>
     <name>CsvImportWidget</name>
     <message>
         <source>Import CSV fields</source>
-        <translation type="unfinished"></translation>
+        <translation>Import CSV fields</translation>
     </message>
     <message>
         <source>filename</source>
-        <translation type="unfinished"></translation>
+        <translation>filename</translation>
     </message>
     <message>
         <source>size, rows, columns</source>
-        <translation type="unfinished"></translation>
+        <translation>size, rows, columns</translation>
     </message>
     <message>
         <source>Encoding</source>
-        <translation type="unfinished"></translation>
+        <translation>Encoding</translation>
     </message>
     <message>
         <source>Codec</source>
-        <translation type="unfinished"></translation>
+        <translation>Codec</translation>
     </message>
     <message>
         <source>Text is qualified by</source>
-        <translation type="unfinished"></translation>
+        <translation>Text is qualified by</translation>
     </message>
     <message>
         <source>Fields are separated by</source>
-        <translation type="unfinished"></translation>
+        <translation>Fields are separated by</translation>
     </message>
     <message>
         <source>Comments start with</source>
-        <translation type="unfinished"></translation>
+        <translation>Comments start with</translation>
     </message>
     <message>
         <source>First record has field names</source>
-        <translation type="unfinished"></translation>
+        <translation>First record has field names</translation>
     </message>
     <message>
         <source>Number of headers line to discard</source>
-        <translation type="unfinished"></translation>
+        <translation>Number of headers line to discard</translation>
     </message>
     <message>
         <source>Consider &apos;\&apos; an escape character</source>
-        <translation type="unfinished"></translation>
+        <translation>Consider &apos;\&apos; an escape character</translation>
     </message>
     <message>
         <source>Preview</source>
-        <translation type="unfinished"></translation>
+        <translation>Preview</translation>
     </message>
     <message>
         <source>Column layout</source>
-        <translation type="unfinished"></translation>
+        <translation>Column layout</translation>
     </message>
     <message>
         <source>Not present in CSV file</source>
-        <translation type="unfinished"></translation>
+        <translation>Not present in CSV file</translation>
     </message>
     <message>
         <source>Imported from CSV file</source>
-        <translation type="unfinished"></translation>
+        <translation>Imported from CSV file</translation>
     </message>
     <message>
         <source>Original data: </source>
-        <translation type="unfinished"></translation>
+        <translation>Original data: </translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Error</translation>
     </message>
     <message>
         <source>Empty fieldname %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Empty fieldname %1</translation>
     </message>
     <message>
         <source>column %1</source>
-        <translation type="unfinished"></translation>
+        <translation>column %1</translation>
     </message>
     <message>
         <source>Error(s) detected in CSV file!</source>
-        <translation type="unfinished"></translation>
+        <translation>Error(s) detected in CSV file!</translation>
     </message>
     <message numerus="yes">
         <source>[%n more message(s) skipped]</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation><numerusform>[%n more message(s) skipped]</numerusform><numerusform>[%n more message(s) skipped]</numerusform></translation>
     </message>
     <message>
         <source>CSV import: writer has errors:
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>CSV import: writer has errors:
+%1</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 column(s)</numerusform><numerusform>%n column(s)</numerusform></translation>
     </message>
     <message>
         <source>%1, %2, %3</source>
         <comment>file info: bytes, rows, columns</comment>
-        <translation type="unfinished"></translation>
+        <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 byte(s)</numerusform><numerusform>%n byte(s)</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n row(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation><numerusform>%n row(s)</numerusform><numerusform>%n row(s)</numerusform></translation>
     </message>
 </context>
 <context>
@@ -852,1386 +904,1492 @@ This is necessary to maintain compatibility with the browser plugin.</source>
     <message>
         <source>Root</source>
         <comment>Root group name</comment>
-        <translation type="unfinished"></translation>
+        <translation>Root</translation>
     </message>
     <message>
         <source>File %1 does not exist.</source>
-        <translation type="unfinished"></translation>
+        <translation>File %1 does not exist.</translation>
     </message>
     <message>
         <source>Unable to open file %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Unable to open file %1.</translation>
     </message>
     <message>
         <source>Error while reading the database: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Error while reading the database: %1</translation>
     </message>
     <message>
         <source>Could not save, database has no file name.</source>
-        <translation type="unfinished"></translation>
+        <translation>Could not save, database has no file name.</translation>
     </message>
     <message>
         <source>File cannot be written as it is opened in read-only mode.</source>
-        <translation type="unfinished"></translation>
+        <translation>File cannot be written as it is opened in read-only mode.</translation>
     </message>
 </context>
 <context>
     <name>DatabaseOpenDialog</name>
     <message>
         <source>Unlock Database - KeePassXC</source>
-        <translation type="unfinished"></translation>
+        <translation>Unlock Database - KeePassXC</translation>
     </message>
 </context>
 <context>
     <name>DatabaseOpenWidget</name>
     <message>
         <source>Enter master key</source>
-        <translation type="unfinished"></translation>
+        <translation>Enter master key</translation>
     </message>
     <message>
         <source>Key File:</source>
-        <translation type="unfinished"></translation>
+        <translation>Key File:</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Password:</translation>
     </message>
     <message>
         <source>Browse</source>
-        <translation type="unfinished"></translation>
+        <translation>Browse</translation>
     </message>
     <message>
         <source>Refresh</source>
-        <translation type="unfinished"></translation>
+        <translation>Refresh</translation>
     </message>
     <message>
         <source>Challenge Response:</source>
-        <translation type="unfinished"></translation>
+        <translation>Challenge Response:</translation>
     </message>
     <message>
         <source>Legacy key file format</source>
-        <translation type="unfinished"></translation>
+        <translation>Legacy key file format</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 type="unfinished"></translation>
+        <translation>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</translation>
     </message>
     <message>
         <source>Don&apos;t show this warning again</source>
-        <translation type="unfinished"></translation>
+        <translation>Don&apos;t show this warning again</translation>
     </message>
     <message>
         <source>All files</source>
-        <translation type="unfinished"></translation>
+        <translation>All files</translation>
     </message>
     <message>
         <source>Key files</source>
-        <translation type="unfinished"></translation>
+        <translation>Key files</translation>
     </message>
     <message>
         <source>Select key file</source>
-        <translation type="unfinished"></translation>
+        <translation>Select key file</translation>
     </message>
     <message>
         <source>TouchID for quick unlock</source>
-        <translation type="unfinished"></translation>
+        <translation>TouchID for quick unlock</translation>
     </message>
     <message>
         <source>Unable to open the database:
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Unable to open the database:
+%1</translation>
     </message>
     <message>
-        <source>Can&apos;t open key file:
+        <source>Can't open key file:
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Can&apos;t open key file:
+%1</translation>
     </message>
 </context>
 <context>
     <name>DatabaseSettingWidgetMetaData</name>
     <message>
         <source>Passwords</source>
-        <translation type="unfinished"></translation>
+        <translation>Passwords</translation>
     </message>
 </context>
 <context>
     <name>DatabaseSettingsDialog</name>
     <message>
         <source>Advanced Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Advanced Settings</translation>
     </message>
     <message>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>General</translation>
     </message>
     <message>
         <source>Security</source>
-        <translation type="unfinished"></translation>
+        <translation>Security</translation>
     </message>
     <message>
         <source>Master Key</source>
-        <translation type="unfinished"></translation>
+        <translation>Master Key</translation>
     </message>
     <message>
         <source>Encryption Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Encryption Settings</translation>
     </message>
     <message>
         <source>Browser Integration</source>
-        <translation type="unfinished"></translation>
+        <translation>Browser Integration</translation>
     </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetBrowser</name>
     <message>
         <source>KeePassXC-Browser settings</source>
-        <translation type="unfinished"></translation>
+        <translation>KeePassXC-Browser settings</translation>
     </message>
     <message>
         <source>&amp;Disconnect all browsers</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Disconnect all browsers</translation>
     </message>
     <message>
         <source>Forg&amp;et all site-specific settings on entries</source>
-        <translation type="unfinished"></translation>
+        <translation>Forg&amp;et all site-specific settings on entries</translation>
     </message>
     <message>
         <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
-        <translation type="unfinished"></translation>
+        <translation>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</translation>
     </message>
     <message>
         <source>Stored keys</source>
-        <translation type="unfinished"></translation>
+        <translation>Stored keys</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Remove</translation>
     </message>
     <message>
         <source>Delete the selected key?</source>
-        <translation type="unfinished"></translation>
+        <translation>Delete the selected key?</translation>
     </message>
     <message>
         <source>Do you really want to delete the selected key?
 This may prevent connection to the browser plugin.</source>
-        <translation type="unfinished"></translation>
+        <translation>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</translation>
     </message>
     <message>
         <source>Key</source>
-        <translation type="unfinished"></translation>
+        <translation>Key</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Value</translation>
     </message>
     <message>
         <source>Enable Browser Integration to access these settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>Enable Browser Integration to access these settings.</translation>
     </message>
     <message>
         <source>Disconnect all browsers</source>
-        <translation type="unfinished"></translation>
+        <translation>Disconnect all browsers</translation>
     </message>
     <message>
         <source>Do you really want to disconnect all browsers?
 This may prevent connection to the browser plugin.</source>
-        <translation type="unfinished"></translation>
+        <translation>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</translation>
     </message>
     <message>
         <source>KeePassXC: No keys found</source>
-        <translation type="unfinished"></translation>
+        <translation>KeePassXC: No keys found</translation>
     </message>
     <message>
         <source>No shared encryption keys found in KeePassXC settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>No shared encryption keys found in KeePassXC settings.</translation>
     </message>
     <message>
         <source>KeePassXC: Removed keys from database</source>
-        <translation type="unfinished"></translation>
+        <translation>KeePassXC: Removed keys from database</translation>
     </message>
     <message numerus="yes">
         <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation><numerusform>Successfully removed %n encryption key(s) from KeePassXC settings.</numerusform><numerusform>Successfully removed %n encryption key(s) from KeePassXC settings.</numerusform></translation>
     </message>
     <message>
         <source>Forget all site-specific settings on entries</source>
-        <translation type="unfinished"></translation>
+        <translation>Forget all site-specific settings on entries</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 type="unfinished"></translation>
+        <translation>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</translation>
     </message>
     <message>
         <source>Removing stored permissions…</source>
-        <translation type="unfinished"></translation>
+        <translation>Removing stored permissions…</translation>
     </message>
     <message>
         <source>Abort</source>
-        <translation type="unfinished"></translation>
+        <translation>Abort</translation>
     </message>
     <message>
         <source>KeePassXC: Removed permissions</source>
-        <translation type="unfinished"></translation>
+        <translation>KeePassXC: Removed permissions</translation>
     </message>
     <message numerus="yes">
         <source>Successfully removed permissions from %n entry(s).</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation><numerusform>Successfully removed permissions from %n entry(s).</numerusform><numerusform>Successfully removed permissions from %n entry(s).</numerusform></translation>
     </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
-        <translation type="unfinished"></translation>
+        <translation>KeePassXC: No entry with permissions found!</translation>
     </message>
     <message>
         <source>The active database does not contain an entry with permissions.</source>
-        <translation type="unfinished"></translation>
+        <translation>The active database does not contain an entry with permissions.</translation>
     </message>
     <message>
         <source>Move KeePassHTTP attributes to custom data</source>
-        <translation type="unfinished"></translation>
+        <translation>Move KeePassHTTP attributes to custom data</translation>
     </message>
     <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 type="unfinished"></translation>
+        <translation>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.</translation>
     </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetEncryption</name>
     <message>
         <source>Encryption Algorithm:</source>
-        <translation type="unfinished"></translation>
+        <translation>Encryption Algorithm:</translation>
     </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
-        <translation type="unfinished"></translation>
+        <translation>AES:  256 Bit   (default)</translation>
     </message>
     <message>
         <source>Twofish:  256 Bit</source>
-        <translation type="unfinished"></translation>
+        <translation>Twofish:  256 Bit</translation>
     </message>
     <message>
         <source>Key Derivation Function:</source>
-        <translation type="unfinished"></translation>
+        <translation>Key Derivation Function:</translation>
     </message>
     <message>
         <source>Transform rounds:</source>
-        <translation type="unfinished"></translation>
+        <translation>Transform rounds:</translation>
     </message>
     <message>
         <source>Benchmark 1-second delay</source>
-        <translation type="unfinished"></translation>
+        <translation>Benchmark 1-second delay</translation>
     </message>
     <message>
         <source>Memory Usage:</source>
-        <translation type="unfinished"></translation>
+        <translation>Memory Usage:</translation>
     </message>
     <message>
         <source>Parallelism:</source>
-        <translation type="unfinished"></translation>
+        <translation>Parallelism:</translation>
     </message>
     <message>
         <source>Decryption Time:</source>
-        <translation type="unfinished"></translation>
+        <translation>Decryption Time:</translation>
     </message>
     <message>
         <source>?? s</source>
-        <translation type="unfinished"></translation>
+        <translation>?? s</translation>
     </message>
     <message>
         <source>Change</source>
-        <translation type="unfinished"></translation>
+        <translation>Change</translation>
     </message>
     <message>
         <source>100 ms</source>
-        <translation type="unfinished"></translation>
+        <translation>100 ms</translation>
     </message>
     <message>
         <source>5 s</source>
-        <translation type="unfinished"></translation>
+        <translation>5 s</translation>
     </message>
     <message>
         <source>Higher values offer more protection, but opening the database will take longer.</source>
-        <translation type="unfinished"></translation>
+        <translation>Higher values offer more protection, but opening the database will take longer.</translation>
     </message>
     <message>
         <source>Database format:</source>
-        <translation type="unfinished"></translation>
+        <translation>Database format:</translation>
     </message>
     <message>
         <source>This is only important if you need to use your database with other programs.</source>
-        <translation type="unfinished"></translation>
+        <translation>This is only important if you need to use your database with other programs.</translation>
     </message>
     <message>
         <source>KDBX 4.0 (recommended)</source>
-        <translation type="unfinished"></translation>
+        <translation>KDBX 4.0 (recommended)</translation>
     </message>
     <message>
         <source>KDBX 3.1</source>
-        <translation type="unfinished"></translation>
+        <translation>KDBX 3.1</translation>
     </message>
     <message>
         <source>unchanged</source>
         <comment>Database decryption time is unchanged</comment>
-        <translation type="unfinished"></translation>
+        <translation>unchanged</translation>
     </message>
     <message>
         <source>Number of rounds too high</source>
         <comment>Key transformation rounds</comment>
-        <translation type="unfinished"></translation>
+        <translation>Number of rounds too high</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>
+        <translation>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!</translation>
     </message>
     <message>
         <source>Understood, keep number</source>
-        <translation type="unfinished"></translation>
+        <translation>Understood, keep number</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Cancel</translation>
     </message>
     <message>
         <source>Number of rounds too low</source>
         <comment>Key transformation rounds</comment>
-        <translation type="unfinished"></translation>
+        <translation>Number of rounds too low</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>
+        <translation>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!</translation>
     </message>
     <message>
         <source>KDF unchanged</source>
-        <translation type="unfinished"></translation>
+        <translation>KDF unchanged</translation>
     </message>
     <message>
         <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
-        <translation type="unfinished"></translation>
+        <translation>Failed to transform key with new KDF parameters; KDF unchanged.</translation>
     </message>
     <message numerus="yes">
         <source> MiB</source>
         <comment>Abbreviation for Mebibytes (KDF settings)</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation><numerusform> MiB</numerusform><numerusform> MiB</numerusform></translation>
     </message>
     <message numerus="yes">
         <source> thread(s)</source>
         <comment>Threads for parallel execution (KDF settings)</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation><numerusform> thread(s)</numerusform><numerusform> thread(s)</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%1 ms</source>
         <comment>milliseconds</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation><numerusform>%1 ms</numerusform><numerusform>%1 ms</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%1 s</source>
         <comment>seconds</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform></translation>
     </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
     <message>
         <source>Database Meta Data</source>
-        <translation type="unfinished"></translation>
+        <translation>Database Meta Data</translation>
     </message>
     <message>
         <source>Database name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Database name:</translation>
     </message>
     <message>
         <source>Database description:</source>
-        <translation type="unfinished"></translation>
+        <translation>Database description:</translation>
     </message>
     <message>
         <source>Default username:</source>
-        <translation type="unfinished"></translation>
+        <translation>Default username:</translation>
     </message>
     <message>
         <source>History Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>History Settings</translation>
     </message>
     <message>
         <source>Max. history items:</source>
-        <translation type="unfinished"></translation>
+        <translation>Max. history items:</translation>
     </message>
     <message>
         <source>Max. history size:</source>
-        <translation type="unfinished"></translation>
+        <translation>Max. history size:</translation>
     </message>
     <message>
         <source> MiB</source>
-        <translation type="unfinished"></translation>
+        <translation> MiB</translation>
     </message>
     <message>
         <source>Use recycle bin</source>
-        <translation type="unfinished"></translation>
+        <translation>Use recycle bin</translation>
     </message>
     <message>
         <source>Additional Database Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Additional Database Settings</translation>
     </message>
     <message>
         <source>Enable &amp;compression (recommended)</source>
-        <translation type="unfinished"></translation>
+        <translation>Enable &amp;compression (recommended)</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetKeeShare</name>
+    <message>
+        <source>Sharing</source>
+        <translation>Sharing</translation>
+    </message>
+    <message>
+        <source>Breadcrumb</source>
+        <translation>Breadcrumb</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation>Path</translation>
+    </message>
+    <message>
+        <source>Last Signer</source>
+        <translation>Last Signer</translation>
+    </message>
+    <message>
+        <source>Certificates</source>
+        <translation>Certificates</translation>
+    </message>
+    <message>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation> &gt; </translation>
     </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
         <source>Add additional protection...</source>
-        <translation type="unfinished"></translation>
+        <translation>Add additional protection...</translation>
     </message>
     <message>
         <source>No encryption key added</source>
-        <translation type="unfinished"></translation>
+        <translation>No encryption key added</translation>
     </message>
     <message>
         <source>You must add at least one encryption key to secure your database!</source>
-        <translation type="unfinished"></translation>
+        <translation>You must add at least one encryption key to secure your database!</translation>
     </message>
     <message>
         <source>No password set</source>
-        <translation type="unfinished"></translation>
+        <translation>No password set</translation>
     </message>
     <message>
         <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 type="unfinished"></translation>
+        <translation>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?</translation>
     </message>
     <message>
         <source>Unknown error</source>
-        <translation type="unfinished"></translation>
+        <translation>Unknown error</translation>
     </message>
     <message>
         <source>Failed to change master key</source>
-        <translation type="unfinished"></translation>
+        <translation>Failed to change master key</translation>
     </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
         <source>Database Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Database Name:</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation type="unfinished"></translation>
+        <translation>Description:</translation>
     </message>
 </context>
 <context>
     <name>DatabaseTabWidget</name>
     <message>
         <source>KeePass 2 Database</source>
-        <translation type="unfinished"></translation>
+        <translation>KeePass 2 Database</translation>
     </message>
     <message>
         <source>All files</source>
-        <translation type="unfinished"></translation>
+        <translation>All files</translation>
     </message>
     <message>
         <source>Open database</source>
-        <translation type="unfinished"></translation>
+        <translation>Open database</translation>
     </message>
     <message>
         <source>CSV file</source>
-        <translation type="unfinished"></translation>
+        <translation>CSV file</translation>
     </message>
     <message>
         <source>Merge database</source>
-        <translation type="unfinished"></translation>
+        <translation>Merge database</translation>
     </message>
     <message>
         <source>Open KeePass 1 database</source>
-        <translation type="unfinished"></translation>
+        <translation>Open KeePass 1 database</translation>
     </message>
     <message>
         <source>KeePass 1 database</source>
-        <translation type="unfinished"></translation>
+        <translation>KeePass 1 database</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
-        <translation type="unfinished"></translation>
+        <translation>Export database to CSV file</translation>
     </message>
     <message>
         <source>Writing the CSV file failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Writing the CSV file failed.</translation>
     </message>
     <message>
         <source>Database creation error</source>
-        <translation type="unfinished"></translation>
+        <translation>Database creation error</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 type="unfinished"></translation>
+        <translation>The created database has no key or KDF, refusing to save it.
+This is definitely a bug, please report it to the developers.</translation>
     </message>
     <message>
         <source>The database file does not exist or is not accessible.</source>
-        <translation type="unfinished"></translation>
+        <translation>The database file does not exist or is not accessible.</translation>
     </message>
     <message>
         <source>Select CSV file</source>
-        <translation type="unfinished"></translation>
+        <translation>Select CSV file</translation>
     </message>
     <message>
         <source>New Database</source>
-        <translation type="unfinished"></translation>
+        <translation>New Database</translation>
     </message>
     <message>
         <source>%1 [New Database]</source>
         <comment>Database tab name modifier</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 [New Database]</translation>
     </message>
     <message>
         <source>%1 [Locked]</source>
         <comment>Database tab name modifier</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 [Locked]</translation>
     </message>
     <message>
         <source>%1 [Read-only]</source>
         <comment>Database tab name modifier</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 [Read-only]</translation>
     </message>
 </context>
 <context>
     <name>DatabaseWidget</name>
     <message>
         <source>Searching...</source>
-        <translation type="unfinished"></translation>
+        <translation>Searching...</translation>
     </message>
     <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
-        <translation type="unfinished"></translation>
+        <translation>Do you really want to delete the entry &quot;%1&quot; for good?</translation>
     </message>
     <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation type="unfinished"></translation>
+        <translation>Do you really want to move entry &quot;%1&quot; to the recycle bin?</translation>
     </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation><numerusform>Do you really want to move %n entry(s) to the recycle bin?</numerusform><numerusform>Do you really want to move %n entry(s) to the recycle bin?</numerusform></translation>
     </message>
     <message>
         <source>Execute command?</source>
-        <translation type="unfinished"></translation>
+        <translation>Execute command?</translation>
     </message>
     <message>
         <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
     </message>
     <message>
         <source>Remember my choice</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete group?</source>
-        <translation type="unfinished"></translation>
+        <translation>Remember my choice</translation>
     </message>
     <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
-        <translation type="unfinished"></translation>
+        <translation>Do you really want to delete the group &quot;%1&quot; for good?</translation>
     </message>
     <message>
         <source>No current database.</source>
-        <translation type="unfinished"></translation>
+        <translation>No current database.</translation>
     </message>
     <message>
         <source>No source database, nothing to do.</source>
-        <translation type="unfinished"></translation>
+        <translation>No source database, nothing to do.</translation>
     </message>
     <message>
         <source>Search Results (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Search Results (%1)</translation>
     </message>
     <message>
         <source>No Results</source>
-        <translation type="unfinished"></translation>
+        <translation>No Results</translation>
     </message>
     <message>
         <source>File has changed</source>
-        <translation type="unfinished"></translation>
+        <translation>File has changed</translation>
     </message>
     <message>
         <source>The database file has changed. Do you want to load the changes?</source>
-        <translation type="unfinished"></translation>
+        <translation>The database file has changed. Do you want to load the changes?</translation>
     </message>
     <message>
         <source>Merge Request</source>
-        <translation type="unfinished"></translation>
+        <translation>Merge Request</translation>
     </message>
     <message>
         <source>The database file has changed and you have unsaved changes.
 Do you want to merge your changes?</source>
-        <translation type="unfinished"></translation>
+        <translation>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</translation>
     </message>
     <message>
         <source>Empty recycle bin?</source>
-        <translation type="unfinished"></translation>
+        <translation>Empty recycle bin?</translation>
     </message>
     <message>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
-        <translation type="unfinished"></translation>
+        <translation>Are you sure you want to permanently delete everything from your recycle bin?</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>Do you really want to delete %n entry(s) for good?</numerusform><numerusform>Do you really want to delete %n entry(s) for good?</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>Delete entry(s)?</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation><numerusform>Delete entry(s)?</numerusform><numerusform>Delete entry(s)?</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>Move entry(s) to recycle bin?</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation><numerusform>Move entry(s) to recycle bin?</numerusform><numerusform>Move entry(s) to recycle bin?</numerusform></translation>
     </message>
     <message>
         <source>File opened in read only mode.</source>
-        <translation type="unfinished"></translation>
+        <translation>File opened in read only mode.</translation>
     </message>
     <message>
         <source>Lock Database?</source>
-        <translation type="unfinished"></translation>
+        <translation>Lock Database?</translation>
     </message>
     <message>
         <source>You are editing an entry. Discard changes and lock anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation>You are editing an entry. Discard changes and lock anyway?</translation>
     </message>
     <message>
         <source>&quot;%1&quot; was modified.
 Save changes?</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;%1&quot; was modified.
+Save changes?</translation>
     </message>
     <message>
         <source>Database was modified.
 Save changes?</source>
-        <translation type="unfinished"></translation>
+        <translation>Database was modified.
+Save changes?</translation>
     </message>
     <message>
         <source>Save changes?</source>
-        <translation type="unfinished"></translation>
+        <translation>Save changes?</translation>
     </message>
     <message>
         <source>Could not open the new database file while attempting to autoreload.
 Error: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Could not open the new database file while attempting to autoreload.
+Error: %1</translation>
     </message>
     <message>
         <source>Disable safe saves?</source>
-        <translation type="unfinished"></translation>
+        <translation>Disable safe saves?</translation>
     </message>
     <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 type="unfinished"></translation>
+        <translation>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?</translation>
     </message>
     <message>
         <source>Writing the database failed.
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Writing the database failed.
+%1</translation>
     </message>
     <message>
         <source>Passwords</source>
-        <translation type="unfinished"></translation>
+        <translation>Passwords</translation>
     </message>
     <message>
         <source>Save database as</source>
-        <translation type="unfinished"></translation>
+        <translation>Save database as</translation>
     </message>
     <message>
         <source>KeePass 2 Database</source>
-        <translation type="unfinished"></translation>
+        <translation>KeePass 2 Database</translation>
+    </message>
+    <message>
+        <source>Replace references to entry?</source>
+        <translation>Replace references to entry?</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>Entry &quot;%1&quot; has %2 reference(s). Do you want to overwrite references with values, skip this entry, or delete anyway?</numerusform><numerusform>Entry &quot;%1&quot; has %2 reference(s). Do you want to overwrite references with values, skip this entry, or delete anyway?</numerusform></translation>
+    </message>
+    <message>
+        <source>Delete group</source>
+        <translation>Delete group</translation>
+    </message>
+    <message>
+        <source>Move group to recycle bin?</source>
+        <translation>Move group to recycle bin?</translation>
+    </message>
+    <message>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation>Do you really want to move the group &quot;%1&quot; to the recycle bin?</translation>
+    </message>
+    <message>
+        <source>Successfully merged the database files.</source>
+        <translation>Successfully merged the database files.</translation>
+    </message>
+    <message>
+        <source>Database was not modified by merge operation.</source>
+        <translation>Database was not modified by merge operation.</translation>
     </message>
 </context>
 <context>
     <name>EditEntryWidget</name>
     <message>
         <source>Entry</source>
-        <translation type="unfinished"></translation>
+        <translation>Entry</translation>
     </message>
     <message>
         <source>Advanced</source>
-        <translation type="unfinished"></translation>
+        <translation>Advanced</translation>
     </message>
     <message>
         <source>Icon</source>
-        <translation type="unfinished"></translation>
+        <translation>Icon</translation>
     </message>
     <message>
         <source>Auto-Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Auto-Type</translation>
     </message>
     <message>
         <source>Properties</source>
-        <translation type="unfinished"></translation>
+        <translation>Properties</translation>
     </message>
     <message>
         <source>History</source>
-        <translation type="unfinished"></translation>
+        <translation>History</translation>
     </message>
     <message>
         <source>SSH Agent</source>
-        <translation type="unfinished"></translation>
+        <translation>SSH Agent</translation>
     </message>
     <message>
         <source>n/a</source>
-        <translation type="unfinished"></translation>
+        <translation>n/a</translation>
     </message>
     <message>
         <source>(encrypted)</source>
-        <translation type="unfinished"></translation>
+        <translation>(encrypted)</translation>
     </message>
     <message>
         <source>Select private key</source>
-        <translation type="unfinished"></translation>
+        <translation>Select private key</translation>
     </message>
     <message>
         <source>File too large to be a private key</source>
-        <translation type="unfinished"></translation>
+        <translation>File too large to be a private key</translation>
     </message>
     <message>
         <source>Failed to open private key</source>
-        <translation type="unfinished"></translation>
+        <translation>Failed to open private key</translation>
     </message>
     <message>
         <source>Entry history</source>
-        <translation type="unfinished"></translation>
+        <translation>Entry history</translation>
     </message>
     <message>
         <source>Add entry</source>
-        <translation type="unfinished"></translation>
+        <translation>Add entry</translation>
     </message>
     <message>
         <source>Edit entry</source>
-        <translation type="unfinished"></translation>
+        <translation>Edit entry</translation>
     </message>
     <message>
         <source>Different passwords supplied.</source>
-        <translation type="unfinished"></translation>
+        <translation>Different passwords supplied.</translation>
     </message>
     <message>
         <source>New attribute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Confirm Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>New attribute</translation>
     </message>
     <message>
         <source>Are you sure you want to remove this attribute?</source>
-        <translation type="unfinished"></translation>
+        <translation>Are you sure you want to remove this attribute?</translation>
     </message>
     <message>
         <source>Tomorrow</source>
-        <translation type="unfinished"></translation>
+        <translation>Tomorrow</translation>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation><numerusform>%n week(s)</numerusform><numerusform>%n week(s)</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation><numerusform>%n month(s)</numerusform><numerusform>%n month(s)</numerusform></translation>
     </message>
     <message>
         <source>Apply generated password?</source>
-        <translation type="unfinished"></translation>
+        <translation>Apply generated password?</translation>
     </message>
     <message>
         <source>Do you want to apply the generated password to this entry?</source>
-        <translation type="unfinished"></translation>
+        <translation>Do you want to apply the generated password to this entry?</translation>
     </message>
     <message>
         <source>Entry updated successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation>Entry updated successfully.</translation>
     </message>
     <message>
         <source>Entry has unsaved changes</source>
-        <translation type="unfinished"></translation>
+        <translation>Entry has unsaved changes</translation>
     </message>
     <message>
         <source>New attribute %1</source>
-        <translation type="unfinished"></translation>
+        <translation>New attribute %1</translation>
     </message>
     <message>
         <source>[PROTECTED] Press reveal to view or edit</source>
-        <translation type="unfinished"></translation>
+        <translation>[PROTECTED] Press reveal to view or edit</translation>
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation><numerusform>%n year(s)</numerusform><numerusform>%n year(s)</numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation>Confirm Removal</translation>
     </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
     <message>
         <source>Additional attributes</source>
-        <translation type="unfinished"></translation>
+        <translation>Additional attributes</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Add</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Remove</translation>
     </message>
     <message>
         <source>Edit Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Edit Name</translation>
     </message>
     <message>
         <source>Protect</source>
-        <translation type="unfinished"></translation>
+        <translation>Protect</translation>
     </message>
     <message>
         <source>Reveal</source>
-        <translation type="unfinished"></translation>
+        <translation>Reveal</translation>
     </message>
     <message>
         <source>Attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>Attachments</translation>
     </message>
     <message>
         <source>Foreground Color:</source>
-        <translation type="unfinished"></translation>
+        <translation>Foreground Color:</translation>
     </message>
     <message>
         <source>Background Color:</source>
-        <translation type="unfinished"></translation>
+        <translation>Background Color:</translation>
     </message>
 </context>
 <context>
     <name>EditEntryWidgetAutoType</name>
     <message>
         <source>Enable Auto-Type for this entry</source>
-        <translation type="unfinished"></translation>
+        <translation>Enable Auto-Type for this entry</translation>
     </message>
     <message>
         <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation type="unfinished"></translation>
+        <translation>Inherit default Auto-Type sequence from the &amp;group</translation>
     </message>
     <message>
         <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Use custom Auto-Type sequence:</translation>
     </message>
     <message>
         <source>Window Associations</source>
-        <translation type="unfinished"></translation>
+        <translation>Window Associations</translation>
     </message>
     <message>
         <source>+</source>
-        <translation type="unfinished"></translation>
+        <translation>+</translation>
     </message>
     <message>
         <source>-</source>
-        <translation type="unfinished"></translation>
+        <translation>-</translation>
     </message>
     <message>
         <source>Window title:</source>
-        <translation type="unfinished"></translation>
+        <translation>Window title:</translation>
     </message>
     <message>
         <source>Use a specific sequence for this association:</source>
-        <translation type="unfinished"></translation>
+        <translation>Use a specific sequence for this association:</translation>
     </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
     <message>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation>Show</translation>
     </message>
     <message>
         <source>Restore</source>
-        <translation type="unfinished"></translation>
+        <translation>Restore</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Delete</translation>
     </message>
     <message>
         <source>Delete all</source>
-        <translation type="unfinished"></translation>
+        <translation>Delete all</translation>
     </message>
 </context>
 <context>
     <name>EditEntryWidgetMain</name>
     <message>
         <source>URL:</source>
-        <translation type="unfinished"></translation>
+        <translation>URL:</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Password:</translation>
     </message>
     <message>
         <source>Repeat:</source>
-        <translation type="unfinished"></translation>
+        <translation>Repeat:</translation>
     </message>
     <message>
         <source>Title:</source>
-        <translation type="unfinished"></translation>
+        <translation>Title:</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation>Notes</translation>
     </message>
     <message>
         <source>Presets</source>
-        <translation type="unfinished"></translation>
+        <translation>Presets</translation>
     </message>
     <message>
         <source>Toggle the checkbox to reveal the notes section.</source>
-        <translation type="unfinished"></translation>
+        <translation>Toggle the checkbox to reveal the notes section.</translation>
     </message>
     <message>
         <source>Username:</source>
-        <translation type="unfinished"></translation>
+        <translation>Username:</translation>
     </message>
     <message>
         <source>Expires</source>
-        <translation type="unfinished"></translation>
+        <translation>Expires</translation>
     </message>
 </context>
 <context>
     <name>EditEntryWidgetSSHAgent</name>
     <message>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Form</translation>
     </message>
     <message>
         <source>Remove key from agent after</source>
-        <translation type="unfinished"></translation>
+        <translation>Remove key from agent after</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation type="unfinished"></translation>
+        <translation> seconds</translation>
     </message>
     <message>
         <source>Fingerprint</source>
-        <translation type="unfinished"></translation>
+        <translation>Fingerprint</translation>
     </message>
     <message>
         <source>Remove key from agent when database is closed/locked</source>
-        <translation type="unfinished"></translation>
+        <translation>Remove key from agent when database is closed/locked</translation>
     </message>
     <message>
         <source>Public key</source>
-        <translation type="unfinished"></translation>
+        <translation>Public key</translation>
     </message>
     <message>
         <source>Add key to agent when database is opened/unlocked</source>
-        <translation type="unfinished"></translation>
+        <translation>Add key to agent when database is opened/unlocked</translation>
     </message>
     <message>
         <source>Comment</source>
-        <translation type="unfinished"></translation>
+        <translation>Comment</translation>
     </message>
     <message>
         <source>Decrypt</source>
-        <translation type="unfinished"></translation>
+        <translation>Decrypt</translation>
     </message>
     <message>
         <source>n/a</source>
-        <translation type="unfinished"></translation>
+        <translation>n/a</translation>
     </message>
     <message>
         <source>Copy to clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Copy to clipboard</translation>
     </message>
     <message>
         <source>Private key</source>
-        <translation type="unfinished"></translation>
+        <translation>Private key</translation>
     </message>
     <message>
         <source>External file</source>
-        <translation type="unfinished"></translation>
+        <translation>External file</translation>
     </message>
     <message>
         <source>Browse...</source>
         <extracomment>Button for opening file dialog</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Browse...</translation>
     </message>
     <message>
         <source>Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>Attachment</translation>
     </message>
     <message>
         <source>Add to agent</source>
-        <translation type="unfinished"></translation>
+        <translation>Add to agent</translation>
     </message>
     <message>
         <source>Remove from agent</source>
-        <translation type="unfinished"></translation>
+        <translation>Remove from agent</translation>
     </message>
     <message>
         <source>Require user confirmation when this key is used</source>
-        <translation type="unfinished"></translation>
+        <translation>Require user confirmation when this key is used</translation>
     </message>
 </context>
 <context>
     <name>EditGroupWidget</name>
     <message>
         <source>Group</source>
-        <translation type="unfinished"></translation>
+        <translation>Group</translation>
     </message>
     <message>
         <source>Icon</source>
-        <translation type="unfinished"></translation>
+        <translation>Icon</translation>
     </message>
     <message>
         <source>Properties</source>
-        <translation type="unfinished"></translation>
+        <translation>Properties</translation>
     </message>
     <message>
         <source>Add group</source>
-        <translation type="unfinished"></translation>
+        <translation>Add group</translation>
     </message>
     <message>
         <source>Edit group</source>
-        <translation type="unfinished"></translation>
+        <translation>Edit group</translation>
     </message>
     <message>
         <source>Enable</source>
-        <translation type="unfinished"></translation>
+        <translation>Enable</translation>
     </message>
     <message>
         <source>Disable</source>
-        <translation type="unfinished"></translation>
+        <translation>Disable</translation>
     </message>
     <message>
         <source>Inherit from parent group (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Inherit from parent group (%1)</translation>
+    </message>
+</context>
+<context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation>Type:</translation>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation>Path:</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Password:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation>Inactive</translation>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation>Import from path</translation>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation>Export to path</translation>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation>Synchronize with path</translation>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation>Your KeePassXC version does not support sharing your container type. Please use %1.</translation>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation>Database sharing is disabled</translation>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation>Database export is disabled</translation>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation>Database import is disabled</translation>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation>KeeShare unsigned container</translation>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation>KeeShare signed container</translation>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation>Select import source</translation>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation>Select export target</translation>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation>Select import/export file</translation>
     </message>
 </context>
 <context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Name</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation>Notes</translation>
     </message>
     <message>
         <source>Expires</source>
-        <translation type="unfinished"></translation>
+        <translation>Expires</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="unfinished"></translation>
+        <translation>Search</translation>
     </message>
     <message>
         <source>Auto-Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Auto-Type</translation>
     </message>
     <message>
         <source>&amp;Use default Auto-Type sequence of parent group</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Use default Auto-Type sequence of parent group</translation>
     </message>
     <message>
         <source>Set default Auto-Type se&amp;quence</source>
-        <translation type="unfinished"></translation>
+        <translation>Set default Auto-Type se&amp;quence</translation>
     </message>
 </context>
 <context>
     <name>EditWidgetIcons</name>
     <message>
         <source>&amp;Use default icon</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Use default icon</translation>
     </message>
     <message>
         <source>Use custo&amp;m icon</source>
-        <translation type="unfinished"></translation>
+        <translation>Use custo&amp;m icon</translation>
     </message>
     <message>
         <source>Add custom icon</source>
-        <translation type="unfinished"></translation>
+        <translation>Add custom icon</translation>
     </message>
     <message>
         <source>Delete custom icon</source>
-        <translation type="unfinished"></translation>
+        <translation>Delete custom icon</translation>
     </message>
     <message>
         <source>Download favicon</source>
-        <translation type="unfinished"></translation>
+        <translation>Download favicon</translation>
     </message>
     <message>
         <source>Unable to fetch favicon.</source>
-        <translation type="unfinished"></translation>
+        <translation>Unable to fetch favicon.</translation>
     </message>
     <message>
         <source>Images</source>
-        <translation type="unfinished"></translation>
+        <translation>Images</translation>
     </message>
     <message>
         <source>All files</source>
-        <translation type="unfinished"></translation>
+        <translation>All files</translation>
     </message>
     <message>
         <source>Custom icon already exists</source>
-        <translation type="unfinished"></translation>
+        <translation>Custom icon already exists</translation>
     </message>
     <message>
         <source>Confirm Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Confirm Delete</translation>
     </message>
     <message>
         <source>Custom icon successfully downloaded</source>
-        <translation type="unfinished"></translation>
+        <translation>Custom icon successfully downloaded</translation>
     </message>
     <message>
         <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation type="unfinished"></translation>
+        <translation>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</translation>
     </message>
     <message>
         <source>Select Image(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>Select Image(s)</translation>
     </message>
     <message numerus="yes">
         <source>Successfully loaded %1 of %n icon(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation><numerusform>Successfully loaded %1 of %n icon(s)</numerusform><numerusform>Successfully loaded %1 of %n icon(s)</numerusform></translation>
     </message>
     <message>
         <source>No icons were loaded</source>
-        <translation type="unfinished"></translation>
+        <translation>No icons were loaded</translation>
     </message>
     <message numerus="yes">
         <source>%n icon(s) already exist in the database</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation><numerusform>%n icon(s) already exist in the database</numerusform><numerusform>%n icon(s) already exist in the database</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>The following icon(s) failed:</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation><numerusform>The following icon(s) failed:</numerusform><numerusform>The following icon(s) failed:</numerusform></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 type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation><numerusform>This icon is used by %n entry(s), and will be replaced by the default icon. Are you sure you want to delete it?</numerusform><numerusform>This icon is used by %n entry(s), and will be replaced by the default icon. Are you sure you want to delete it?</numerusform></translation>
     </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>
     <message>
         <source>Created:</source>
-        <translation type="unfinished"></translation>
+        <translation>Created:</translation>
     </message>
     <message>
         <source>Modified:</source>
-        <translation type="unfinished"></translation>
+        <translation>Modified:</translation>
     </message>
     <message>
         <source>Accessed:</source>
-        <translation type="unfinished"></translation>
+        <translation>Accessed:</translation>
     </message>
     <message>
         <source>Uuid:</source>
-        <translation type="unfinished"></translation>
+        <translation>Uuid:</translation>
     </message>
     <message>
         <source>Plugin Data</source>
-        <translation type="unfinished"></translation>
+        <translation>Plugin Data</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Remove</translation>
     </message>
     <message>
         <source>Delete plugin data?</source>
-        <translation type="unfinished"></translation>
+        <translation>Delete plugin data?</translation>
     </message>
     <message>
         <source>Do you really want to delete the selected plugin data?
 This may cause the affected plugins to malfunction.</source>
-        <translation type="unfinished"></translation>
+        <translation>Do you really want to delete the selected plugin data?
+This may cause the affected plugins to malfunction.</translation>
     </message>
     <message>
         <source>Key</source>
-        <translation type="unfinished"></translation>
+        <translation>Key</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Value</translation>
     </message>
 </context>
 <context>
     <name>Entry</name>
     <message>
         <source>%1 - Clone</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 - Clone</translation>
     </message>
 </context>
 <context>
     <name>EntryAttachmentsModel</name>
     <message>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Name</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Size</translation>
     </message>
 </context>
 <context>
     <name>EntryAttachmentsWidget</name>
     <message>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Form</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Add</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Remove</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Open</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Save</translation>
     </message>
     <message>
         <source>Select files</source>
-        <translation type="unfinished"></translation>
+        <translation>Select files</translation>
     </message>
     <message numerus="yes">
         <source>Are you sure you want to remove %n attachment(s)?</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation><numerusform>Are you sure you want to remove %n attachment(s)?</numerusform><numerusform>Are you sure you want to remove %n attachment(s)?</numerusform></translation>
     </message>
     <message>
         <source>Save attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>Save attachments</translation>
     </message>
     <message>
         <source>Unable to create directory:
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Unable to create directory:
+%1</translation>
     </message>
     <message>
         <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
-        <translation type="unfinished"></translation>
+        <translation>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</translation>
     </message>
     <message>
         <source>Confirm overwrite</source>
-        <translation type="unfinished"></translation>
+        <translation>Confirm overwrite</translation>
     </message>
     <message>
         <source>Unable to save attachments:
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Unable to save attachments:
+%1</translation>
     </message>
     <message>
         <source>Unable to open attachment:
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Unable to open attachment:
+%1</translation>
     </message>
     <message>
         <source>Unable to open attachments:
 %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to open files:
-%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Unable to open attachments:
+%1</translation>
     </message>
     <message>
         <source>Confirm remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Confirm remove</translation>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
+%1</source>
+        <translation><numerusform>Unable to open file(s):
+%1</numerusform><numerusform>Unable to open file(s):
+%1</numerusform></translation>
     </message>
 </context>
 <context>
     <name>EntryAttributesModel</name>
     <message>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>EntryHistoryModel</name>
     <message>
         <source>Last modified</source>
-        <translation type="unfinished"></translation>
+        <translation>Last modified</translation>
     </message>
     <message>
         <source>Title</source>
-        <translation type="unfinished"></translation>
+        <translation>Title</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished"></translation>
+        <translation>Username</translation>
     </message>
     <message>
         <source>URL</source>
-        <translation type="unfinished"></translation>
+        <translation>URL</translation>
     </message>
 </context>
 <context>
@@ -2239,2650 +2397,3091 @@ This may cause the affected plugins to malfunction.</source>
     <message>
         <source>Ref: </source>
         <comment>Reference abbreviation</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ref: </translation>
     </message>
     <message>
         <source>Group</source>
-        <translation type="unfinished"></translation>
+        <translation>Group</translation>
     </message>
     <message>
         <source>Title</source>
-        <translation type="unfinished"></translation>
+        <translation>Title</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished"></translation>
+        <translation>Username</translation>
     </message>
     <message>
         <source>URL</source>
-        <translation type="unfinished"></translation>
+        <translation>URL</translation>
     </message>
     <message>
         <source>Never</source>
-        <translation type="unfinished"></translation>
+        <translation>Never</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Password</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation>Notes</translation>
     </message>
     <message>
         <source>Expires</source>
-        <translation type="unfinished"></translation>
+        <translation>Expires</translation>
     </message>
     <message>
         <source>Created</source>
-        <translation type="unfinished"></translation>
+        <translation>Created</translation>
     </message>
     <message>
         <source>Modified</source>
-        <translation type="unfinished"></translation>
+        <translation>Modified</translation>
     </message>
     <message>
         <source>Accessed</source>
-        <translation type="unfinished"></translation>
+        <translation>Accessed</translation>
     </message>
     <message>
         <source>Attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>Attachments</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Yes</translation>
     </message>
     <message>
         <source>TOTP</source>
-        <translation type="unfinished"></translation>
+        <translation>TOTP</translation>
     </message>
 </context>
 <context>
     <name>EntryPreviewWidget</name>
     <message>
         <source>Generate TOTP Token</source>
-        <translation type="unfinished"></translation>
+        <translation>Generate TOTP Token</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Close</translation>
     </message>
     <message>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>General</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished"></translation>
+        <translation>Username</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Password</translation>
     </message>
     <message>
         <source>Expiration</source>
-        <translation type="unfinished"></translation>
+        <translation>Expiration</translation>
     </message>
     <message>
         <source>URL</source>
-        <translation type="unfinished"></translation>
+        <translation>URL</translation>
     </message>
     <message>
         <source>Attributes</source>
-        <translation type="unfinished"></translation>
+        <translation>Attributes</translation>
     </message>
     <message>
         <source>Attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>Attachments</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation>Notes</translation>
     </message>
     <message>
         <source>Autotype</source>
-        <translation type="unfinished"></translation>
+        <translation>Autotype</translation>
     </message>
     <message>
         <source>Window</source>
-        <translation type="unfinished"></translation>
+        <translation>Window</translation>
     </message>
     <message>
         <source>Sequence</source>
-        <translation type="unfinished"></translation>
+        <translation>Sequence</translation>
     </message>
     <message>
         <source>Searching</source>
-        <translation type="unfinished"></translation>
+        <translation>Searching</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="unfinished"></translation>
+        <translation>Search</translation>
     </message>
     <message>
         <source>Clear</source>
-        <translation type="unfinished"></translation>
+        <translation>Clear</translation>
     </message>
     <message>
         <source>Never</source>
-        <translation type="unfinished"></translation>
+        <translation>Never</translation>
     </message>
     <message>
         <source>[PROTECTED]</source>
-        <translation type="unfinished"></translation>
+        <translation>[PROTECTED]</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
         <comment>attributes line</comment>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
     </message>
     <message>
         <source>Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation>Enabled</translation>
     </message>
     <message>
         <source>Disabled</source>
-        <translation type="unfinished"></translation>
+        <translation>Disabled</translation>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation>Share</translation>
     </message>
 </context>
 <context>
     <name>EntryView</name>
     <message>
         <source>Customize View</source>
-        <translation type="unfinished"></translation>
+        <translation>Customize View</translation>
     </message>
     <message>
         <source>Hide Usernames</source>
-        <translation type="unfinished"></translation>
+        <translation>Hide Usernames</translation>
     </message>
     <message>
         <source>Hide Passwords</source>
-        <translation type="unfinished"></translation>
+        <translation>Hide Passwords</translation>
     </message>
     <message>
         <source>Fit to window</source>
-        <translation type="unfinished"></translation>
+        <translation>Fit to window</translation>
     </message>
     <message>
         <source>Fit to contents</source>
-        <translation type="unfinished"></translation>
+        <translation>Fit to contents</translation>
     </message>
     <message>
         <source>Reset to defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>Reset to defaults</translation>
     </message>
     <message>
         <source>Attachments (icon)</source>
-        <translation type="unfinished"></translation>
+        <translation>Attachments (icon)</translation>
     </message>
 </context>
 <context>
     <name>Group</name>
     <message>
         <source>Recycle Bin</source>
-        <translation type="unfinished"></translation>
+        <translation>Recycle Bin</translation>
     </message>
     <message>
         <source>[empty]</source>
         <comment>group has no children</comment>
-        <translation type="unfinished"></translation>
+        <translation>[empty]</translation>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation>%1</translation>
     </message>
 </context>
 <context>
     <name>HostInstaller</name>
     <message>
         <source>KeePassXC: Cannot save file!</source>
-        <translation type="unfinished"></translation>
+        <translation>KeePassXC: Cannot save file!</translation>
     </message>
     <message>
         <source>Cannot save the native messaging script file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Cannot save the native messaging script file.</translation>
     </message>
 </context>
 <context>
     <name>KMessageWidget</name>
     <message>
         <source>&amp;Close</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Close</translation>
     </message>
     <message>
         <source>Close message</source>
-        <translation type="unfinished"></translation>
+        <translation>Close message</translation>
     </message>
 </context>
 <context>
     <name>Kdbx3Reader</name>
     <message>
         <source>Unable to calculate master key</source>
-        <translation type="unfinished"></translation>
+        <translation>Unable to calculate master key</translation>
     </message>
     <message>
         <source>Unable to issue challenge-response.</source>
-        <translation type="unfinished"></translation>
+        <translation>Unable to issue challenge-response.</translation>
     </message>
     <message>
         <source>Wrong key or database file is corrupt.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wrong key or database file is corrupt.</translation>
     </message>
     <message>
         <source>missing database headers</source>
-        <translation type="unfinished"></translation>
+        <translation>missing database headers</translation>
     </message>
     <message>
         <source>Header doesn&apos;t match hash</source>
-        <translation type="unfinished"></translation>
+        <translation>Header doesn&apos;t match hash</translation>
     </message>
     <message>
         <source>Invalid header id size</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid header id size</translation>
     </message>
     <message>
         <source>Invalid header field length</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid header field length</translation>
     </message>
     <message>
         <source>Invalid header data length</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid header data length</translation>
     </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
     <message>
         <source>Unable to issue challenge-response.</source>
-        <translation type="unfinished"></translation>
+        <translation>Unable to issue challenge-response.</translation>
     </message>
     <message>
         <source>Unable to calculate master key</source>
-        <translation type="unfinished"></translation>
+        <translation>Unable to calculate master key</translation>
     </message>
 </context>
 <context>
     <name>Kdbx4Reader</name>
     <message>
         <source>missing database headers</source>
-        <translation type="unfinished"></translation>
+        <translation>missing database headers</translation>
     </message>
     <message>
         <source>Unable to calculate master key</source>
-        <translation type="unfinished"></translation>
+        <translation>Unable to calculate master key</translation>
     </message>
     <message>
         <source>Invalid header checksum size</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid header checksum size</translation>
     </message>
     <message>
         <source>Header SHA256 mismatch</source>
-        <translation type="unfinished"></translation>
+        <translation>Header SHA256 mismatch</translation>
     </message>
     <message>
         <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
-        <translation type="unfinished"></translation>
+        <translation>Wrong key or database file is corrupt. (HMAC mismatch)</translation>
     </message>
     <message>
         <source>Unknown cipher</source>
-        <translation type="unfinished"></translation>
+        <translation>Unknown cipher</translation>
     </message>
     <message>
         <source>Invalid header id size</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid header id size</translation>
     </message>
     <message>
         <source>Invalid header field length</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid header field length</translation>
     </message>
     <message>
         <source>Invalid header data length</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid header data length</translation>
     </message>
     <message>
         <source>Failed to open buffer for KDF parameters in header</source>
-        <translation type="unfinished"></translation>
+        <translation>Failed to open buffer for KDF parameters in header</translation>
     </message>
     <message>
         <source>Unsupported key derivation function (KDF) or invalid parameters</source>
-        <translation type="unfinished"></translation>
+        <translation>Unsupported key derivation function (KDF) or invalid parameters</translation>
     </message>
     <message>
         <source>Legacy header fields found in KDBX4 file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Legacy header fields found in KDBX4 file.</translation>
     </message>
     <message>
         <source>Invalid inner header id size</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid inner header id size</translation>
     </message>
     <message>
         <source>Invalid inner header field length</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid inner header field length</translation>
     </message>
     <message>
         <source>Invalid inner header binary size</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid inner header binary size</translation>
     </message>
     <message>
         <source>Unsupported KeePass variant map version.</source>
         <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Unsupported KeePass variant map version.</translation>
     </message>
     <message>
         <source>Invalid variant map entry name length</source>
         <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Invalid variant map entry name length</translation>
     </message>
     <message>
         <source>Invalid variant map entry name data</source>
         <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Invalid variant map entry name data</translation>
     </message>
     <message>
         <source>Invalid variant map entry value length</source>
         <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Invalid variant map entry value length</translation>
     </message>
     <message>
         <source>Invalid variant map entry value data</source>
         <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Invalid variant map entry value data</translation>
     </message>
     <message>
         <source>Invalid variant map Bool entry value length</source>
         <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Invalid variant map Bool entry value length</translation>
     </message>
     <message>
         <source>Invalid variant map Int32 entry value length</source>
         <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Invalid variant map Int32 entry value length</translation>
     </message>
     <message>
         <source>Invalid variant map UInt32 entry value length</source>
         <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Invalid variant map UInt32 entry value length</translation>
     </message>
     <message>
         <source>Invalid variant map Int64 entry value length</source>
         <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Invalid variant map Int64 entry value length</translation>
     </message>
     <message>
         <source>Invalid variant map UInt64 entry value length</source>
         <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Invalid variant map UInt64 entry value length</translation>
     </message>
     <message>
         <source>Invalid variant map entry type</source>
         <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Invalid variant map entry type</translation>
     </message>
     <message>
         <source>Invalid variant map field type size</source>
         <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Invalid variant map field type size</translation>
     </message>
 </context>
 <context>
     <name>Kdbx4Writer</name>
     <message>
         <source>Invalid symmetric cipher algorithm.</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid symmetric cipher algorithm.</translation>
     </message>
     <message>
         <source>Invalid symmetric cipher IV size.</source>
         <comment>IV = Initialization Vector for symmetric cipher</comment>
-        <translation type="unfinished"></translation>
+        <translation>Invalid symmetric cipher IV size.</translation>
     </message>
     <message>
         <source>Unable to calculate master key</source>
-        <translation type="unfinished"></translation>
+        <translation>Unable to calculate master key</translation>
     </message>
     <message>
         <source>Failed to serialize KDF parameters variant map</source>
         <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Failed to serialize KDF parameters variant map</translation>
     </message>
 </context>
 <context>
     <name>KdbxReader</name>
     <message>
         <source>Unsupported cipher</source>
-        <translation type="unfinished"></translation>
+        <translation>Unsupported cipher</translation>
     </message>
     <message>
         <source>Invalid compression flags length</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid compression flags length</translation>
     </message>
     <message>
         <source>Unsupported compression algorithm</source>
-        <translation type="unfinished"></translation>
+        <translation>Unsupported compression algorithm</translation>
     </message>
     <message>
         <source>Invalid master seed size</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid master seed size</translation>
     </message>
     <message>
         <source>Invalid transform seed size</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid transform seed size</translation>
     </message>
     <message>
         <source>Invalid transform rounds size</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid transform rounds size</translation>
     </message>
     <message>
         <source>Invalid start bytes size</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid start bytes size</translation>
     </message>
     <message>
         <source>Invalid random stream id size</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid random stream id size</translation>
     </message>
     <message>
         <source>Invalid inner random stream cipher</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid inner random stream cipher</translation>
     </message>
     <message>
         <source>Not a KeePass database.</source>
-        <translation type="unfinished"></translation>
+        <translation>Not a KeePass database.</translation>
     </message>
     <message>
         <source>The selected file is an old KeePass 1 database (.kdb).
 
-You can import it by clicking on Database &gt; &apos;Import KeePass 1 database...&apos;.
+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 type="unfinished"></translation>
+        <translation>The selected file is an old KeePass 1 database (.kdb).
+
+You can import it by clicking on Database &gt; &apos;Import KeePass 1 database...&apos;.
+This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</translation>
     </message>
     <message>
         <source>Unsupported KeePass 2 database version.</source>
-        <translation type="unfinished"></translation>
+        <translation>Unsupported KeePass 2 database version.</translation>
     </message>
     <message>
         <source>Invalid cipher uuid length: %1 (length=%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid cipher uuid length: %1 (length=%2)</translation>
     </message>
     <message>
         <source>Unable to parse UUID: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Unable to parse UUID: %1</translation>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation>Failed to read database file.</translation>
     </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
     <message>
         <source>XML parsing failure: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>XML parsing failure: %1</translation>
     </message>
     <message>
         <source>No root group</source>
-        <translation type="unfinished"></translation>
+        <translation>No root group</translation>
     </message>
     <message>
         <source>Missing icon uuid or data</source>
-        <translation type="unfinished"></translation>
+        <translation>Missing icon uuid or data</translation>
     </message>
     <message>
         <source>Missing custom data key or value</source>
-        <translation type="unfinished"></translation>
+        <translation>Missing custom data key or value</translation>
     </message>
     <message>
         <source>Multiple group elements</source>
-        <translation type="unfinished"></translation>
+        <translation>Multiple group elements</translation>
     </message>
     <message>
         <source>Null group uuid</source>
-        <translation type="unfinished"></translation>
+        <translation>Null group uuid</translation>
     </message>
     <message>
         <source>Invalid group icon number</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid group icon number</translation>
     </message>
     <message>
         <source>Invalid EnableAutoType value</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid EnableAutoType value</translation>
     </message>
     <message>
         <source>Invalid EnableSearching value</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid EnableSearching value</translation>
     </message>
     <message>
         <source>No group uuid found</source>
-        <translation type="unfinished"></translation>
+        <translation>No group uuid found</translation>
     </message>
     <message>
         <source>Null DeleteObject uuid</source>
-        <translation type="unfinished"></translation>
+        <translation>Null DeleteObject uuid</translation>
     </message>
     <message>
         <source>Missing DeletedObject uuid or time</source>
-        <translation type="unfinished"></translation>
+        <translation>Missing DeletedObject uuid or time</translation>
     </message>
     <message>
         <source>Null entry uuid</source>
-        <translation type="unfinished"></translation>
+        <translation>Null entry uuid</translation>
     </message>
     <message>
         <source>Invalid entry icon number</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid entry icon number</translation>
     </message>
     <message>
         <source>History element in history entry</source>
-        <translation type="unfinished"></translation>
+        <translation>History element in history entry</translation>
     </message>
     <message>
         <source>No entry uuid found</source>
-        <translation type="unfinished"></translation>
+        <translation>No entry uuid found</translation>
     </message>
     <message>
         <source>History element with different uuid</source>
-        <translation type="unfinished"></translation>
+        <translation>History element with different uuid</translation>
     </message>
     <message>
         <source>Duplicate custom attribute found</source>
-        <translation type="unfinished"></translation>
+        <translation>Duplicate custom attribute found</translation>
     </message>
     <message>
         <source>Entry string key or value missing</source>
-        <translation type="unfinished"></translation>
+        <translation>Entry string key or value missing</translation>
     </message>
     <message>
         <source>Duplicate attachment found</source>
-        <translation type="unfinished"></translation>
+        <translation>Duplicate attachment found</translation>
     </message>
     <message>
         <source>Entry binary key or value missing</source>
-        <translation type="unfinished"></translation>
+        <translation>Entry binary key or value missing</translation>
     </message>
     <message>
         <source>Auto-type association window or sequence missing</source>
-        <translation type="unfinished"></translation>
+        <translation>Auto-type association window or sequence missing</translation>
     </message>
     <message>
         <source>Invalid bool value</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid bool value</translation>
     </message>
     <message>
         <source>Invalid date time value</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid date time value</translation>
     </message>
     <message>
         <source>Invalid color value</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid color value</translation>
     </message>
     <message>
         <source>Invalid color rgb part</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid color rgb part</translation>
     </message>
     <message>
         <source>Invalid number value</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid number value</translation>
     </message>
     <message>
         <source>Invalid uuid value</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid uuid value</translation>
     </message>
     <message>
         <source>Unable to decompress binary</source>
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Unable to decompress binary</translation>
     </message>
     <message>
         <source>XML error:
 %1
 Line %2, column %3</source>
-        <translation type="unfinished"></translation>
+        <translation>XML error:
+%1
+Line %2, column %3</translation>
     </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
     <message>
         <source>Import KeePass1 database</source>
-        <translation type="unfinished"></translation>
+        <translation>Import KeePass1 database</translation>
     </message>
     <message>
         <source>Unable to open the database.</source>
-        <translation type="unfinished"></translation>
+        <translation>Unable to open the database.</translation>
     </message>
 </context>
 <context>
     <name>KeePass1Reader</name>
     <message>
         <source>Unable to read keyfile.</source>
-        <translation type="unfinished"></translation>
+        <translation>Unable to read keyfile.</translation>
     </message>
     <message>
         <source>Not a KeePass database.</source>
-        <translation type="unfinished"></translation>
+        <translation>Not a KeePass database.</translation>
     </message>
     <message>
         <source>Unsupported encryption algorithm.</source>
-        <translation type="unfinished"></translation>
+        <translation>Unsupported encryption algorithm.</translation>
     </message>
     <message>
         <source>Unsupported KeePass database version.</source>
-        <translation type="unfinished"></translation>
+        <translation>Unsupported KeePass database version.</translation>
     </message>
     <message>
         <source>Unable to read encryption IV</source>
         <comment>IV = Initialization Vector for symmetric cipher</comment>
-        <translation type="unfinished"></translation>
+        <translation>Unable to read encryption IV</translation>
     </message>
     <message>
         <source>Invalid number of groups</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid number of groups</translation>
     </message>
     <message>
         <source>Invalid number of entries</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid number of entries</translation>
     </message>
     <message>
         <source>Invalid content hash size</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid content hash size</translation>
     </message>
     <message>
         <source>Invalid transform seed size</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid transform seed size</translation>
     </message>
     <message>
         <source>Invalid number of transform rounds</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid number of transform rounds</translation>
     </message>
     <message>
         <source>Unable to construct group tree</source>
-        <translation type="unfinished"></translation>
+        <translation>Unable to construct group tree</translation>
     </message>
     <message>
         <source>Root</source>
-        <translation type="unfinished"></translation>
+        <translation>Root</translation>
     </message>
     <message>
         <source>Unable to calculate master key</source>
-        <translation type="unfinished"></translation>
+        <translation>Unable to calculate master key</translation>
     </message>
     <message>
         <source>Wrong key or database file is corrupt.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wrong key or database file is corrupt.</translation>
     </message>
     <message>
         <source>Key transformation failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Key transformation failed</translation>
     </message>
     <message>
         <source>Invalid group field type number</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid group field type number</translation>
     </message>
     <message>
         <source>Invalid group field size</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid group field size</translation>
     </message>
     <message>
         <source>Read group field data doesn&apos;t match size</source>
-        <translation type="unfinished"></translation>
+        <translation>Read group field data doesn&apos;t match size</translation>
     </message>
     <message>
         <source>Incorrect group id field size</source>
-        <translation type="unfinished"></translation>
+        <translation>Incorrect group id field size</translation>
     </message>
     <message>
         <source>Incorrect group creation time field size</source>
-        <translation type="unfinished"></translation>
+        <translation>Incorrect group creation time field size</translation>
     </message>
     <message>
         <source>Incorrect group modification time field size</source>
-        <translation type="unfinished"></translation>
+        <translation>Incorrect group modification time field size</translation>
     </message>
     <message>
         <source>Incorrect group access time field size</source>
-        <translation type="unfinished"></translation>
+        <translation>Incorrect group access time field size</translation>
     </message>
     <message>
         <source>Incorrect group expiry time field size</source>
-        <translation type="unfinished"></translation>
+        <translation>Incorrect group expiry time field size</translation>
     </message>
     <message>
         <source>Incorrect group icon field size</source>
-        <translation type="unfinished"></translation>
+        <translation>Incorrect group icon field size</translation>
     </message>
     <message>
         <source>Incorrect group level field size</source>
-        <translation type="unfinished"></translation>
+        <translation>Incorrect group level field size</translation>
     </message>
     <message>
         <source>Invalid group field type</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid group field type</translation>
     </message>
     <message>
         <source>Missing group id or level</source>
-        <translation type="unfinished"></translation>
+        <translation>Missing group id or level</translation>
     </message>
     <message>
         <source>Missing entry field type number</source>
-        <translation type="unfinished"></translation>
+        <translation>Missing entry field type number</translation>
     </message>
     <message>
         <source>Invalid entry field size</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid entry field size</translation>
     </message>
     <message>
         <source>Read entry field data doesn&apos;t match size</source>
-        <translation type="unfinished"></translation>
+        <translation>Read entry field data doesn&apos;t match size</translation>
     </message>
     <message>
         <source>Invalid entry uuid field size</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid entry uuid field size</translation>
     </message>
     <message>
         <source>Invalid entry group id field size</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid entry group id field size</translation>
     </message>
     <message>
         <source>Invalid entry icon field size</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid entry icon field size</translation>
     </message>
     <message>
         <source>Invalid entry creation time field size</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid entry creation time field size</translation>
     </message>
     <message>
         <source>Invalid entry modification time field size</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid entry modification time field size</translation>
     </message>
     <message>
         <source>Invalid entry expiry time field size</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid entry expiry time field size</translation>
     </message>
     <message>
         <source>Invalid entry field type</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid entry field type</translation>
     </message>
     <message>
         <source>unable to seek to content position</source>
-        <translation type="unfinished"></translation>
+        <translation>unable to seek to content position</translation>
+    </message>
+</context>
+<context>
+    <name>KeeShare</name>
+    <message>
+        <source>Disabled share</source>
+        <translation>Disabled share</translation>
+    </message>
+    <message>
+        <source>Import from</source>
+        <translation>Import from</translation>
+    </message>
+    <message>
+        <source>Export to</source>
+        <translation>Export to</translation>
+    </message>
+    <message>
+        <source>Synchronize with</source>
+        <translation>Synchronize with</translation>
     </message>
 </context>
 <context>
     <name>KeyComponentWidget</name>
     <message>
         <source>Key Component</source>
-        <translation type="unfinished"></translation>
+        <translation>Key Component</translation>
     </message>
     <message>
         <source>Key Component Description</source>
-        <translation type="unfinished"></translation>
+        <translation>Key Component Description</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Cancel</translation>
     </message>
     <message>
         <source>Key Component set, click to change or remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Key Component set, click to change or remove</translation>
     </message>
     <message>
         <source>Add %1</source>
         <comment>Add a key component</comment>
-        <translation type="unfinished"></translation>
+        <translation>Add %1</translation>
     </message>
     <message>
         <source>Change %1</source>
         <comment>Change a key component</comment>
-        <translation type="unfinished"></translation>
+        <translation>Change %1</translation>
     </message>
     <message>
         <source>Remove %1</source>
         <comment>Remove a key component</comment>
-        <translation type="unfinished"></translation>
+        <translation>Remove %1</translation>
     </message>
     <message>
         <source>%1 set, click to change or remove</source>
         <comment>Change or remove a key component</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 set, click to change or remove</translation>
     </message>
 </context>
 <context>
     <name>KeyFileEditWidget</name>
     <message>
         <source>Browse</source>
-        <translation type="unfinished"></translation>
+        <translation>Browse</translation>
     </message>
     <message>
         <source>Generate</source>
-        <translation type="unfinished"></translation>
+        <translation>Generate</translation>
     </message>
     <message>
         <source>Key File</source>
-        <translation type="unfinished"></translation>
+        <translation>Key File</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>
+        <translation>&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;</translation>
     </message>
     <message>
         <source>Legacy key file format</source>
-        <translation type="unfinished"></translation>
+        <translation>Legacy key file format</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 type="unfinished"></translation>
+        <translation>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.</translation>
     </message>
     <message>
-        <source>Error loading the key file &apos;%1&apos;
+        <source>Error loading the key file '%1'
 Message: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Error loading the key file &apos;%1&apos;
+Message: %2</translation>
     </message>
     <message>
         <source>Key files</source>
-        <translation type="unfinished"></translation>
+        <translation>Key files</translation>
     </message>
     <message>
         <source>All files</source>
-        <translation type="unfinished"></translation>
+        <translation>All files</translation>
     </message>
     <message>
         <source>Create Key File...</source>
-        <translation type="unfinished"></translation>
+        <translation>Create Key File...</translation>
     </message>
     <message>
         <source>Error creating key file</source>
-        <translation type="unfinished"></translation>
+        <translation>Error creating key file</translation>
     </message>
     <message>
         <source>Unable to create key file: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Unable to create key file: %1</translation>
     </message>
     <message>
         <source>Select a key file</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Main</name>
-    <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KeePassXC - Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Database password: </source>
-        <translation type="unfinished"></translation>
+        <translation>Select a key file</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>&amp;Database</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Database</translation>
     </message>
     <message>
         <source>&amp;Recent databases</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Recent databases</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Help</translation>
     </message>
     <message>
         <source>E&amp;ntries</source>
-        <translation type="unfinished"></translation>
+        <translation>E&amp;ntries</translation>
     </message>
     <message>
         <source>&amp;Groups</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Groups</translation>
     </message>
     <message>
         <source>&amp;Tools</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Tools</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Quit</translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;About</translation>
     </message>
     <message>
         <source>&amp;Open database...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Open database...</translation>
     </message>
     <message>
         <source>&amp;Save database</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Save database</translation>
     </message>
     <message>
         <source>&amp;Close database</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Close database</translation>
     </message>
     <message>
         <source>&amp;Delete entry</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Delete entry</translation>
     </message>
     <message>
         <source>&amp;Edit group</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Edit group</translation>
     </message>
     <message>
         <source>&amp;Delete group</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Delete group</translation>
     </message>
     <message>
         <source>Sa&amp;ve database as...</source>
-        <translation type="unfinished"></translation>
+        <translation>Sa&amp;ve database as...</translation>
     </message>
     <message>
         <source>Database settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Database settings</translation>
     </message>
     <message>
         <source>&amp;Clone entry</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Clone entry</translation>
     </message>
     <message>
         <source>Copy &amp;username</source>
-        <translation type="unfinished"></translation>
+        <translation>Copy &amp;username</translation>
     </message>
     <message>
         <source>Copy username to clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Copy username to clipboard</translation>
     </message>
     <message>
         <source>Copy password to clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Copy password to clipboard</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Settings</translation>
     </message>
     <message>
         <source>Password Generator</source>
-        <translation type="unfinished"></translation>
+        <translation>Password Generator</translation>
     </message>
     <message>
         <source>&amp;Lock databases</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Lock databases</translation>
     </message>
     <message>
         <source>&amp;Title</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Title</translation>
     </message>
     <message>
         <source>Copy title to clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Copy title to clipboard</translation>
     </message>
     <message>
         <source>&amp;URL</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;URL</translation>
     </message>
     <message>
         <source>Copy URL to clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Copy URL to clipboard</translation>
     </message>
     <message>
         <source>&amp;Notes</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Notes</translation>
     </message>
     <message>
         <source>Copy notes to clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Copy notes to clipboard</translation>
     </message>
     <message>
         <source>&amp;Export to CSV file...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Export to CSV file...</translation>
     </message>
     <message>
         <source>Set up TOTP...</source>
-        <translation type="unfinished"></translation>
+        <translation>Set up TOTP...</translation>
     </message>
     <message>
         <source>Copy &amp;TOTP</source>
-        <translation type="unfinished"></translation>
+        <translation>Copy &amp;TOTP</translation>
     </message>
     <message>
         <source>E&amp;mpty recycle bin</source>
-        <translation type="unfinished"></translation>
+        <translation>E&amp;mpty recycle bin</translation>
     </message>
     <message>
         <source>Clear history</source>
-        <translation type="unfinished"></translation>
+        <translation>Clear history</translation>
     </message>
     <message>
         <source>Access error for config file %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Access error for config file %1</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Settings</translation>
     </message>
     <message>
         <source>Toggle window</source>
-        <translation type="unfinished"></translation>
+        <translation>Toggle window</translation>
     </message>
     <message>
         <source>Quit KeePassXC</source>
-        <translation type="unfinished"></translation>
+        <translation>Quit KeePassXC</translation>
     </message>
     <message>
         <source>Please touch the button on your YubiKey!</source>
-        <translation type="unfinished"></translation>
+        <translation>Please touch the button on your YubiKey!</translation>
     </message>
     <message>
         <source>WARNING: You are using an unstable build of KeePassXC!
 There is a high risk of corruption, maintain a backup of your databases.
 This version is not meant for production use.</source>
-        <translation type="unfinished"></translation>
+        <translation>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</translation>
     </message>
     <message>
         <source>&amp;Donate</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Donate</translation>
     </message>
     <message>
         <source>Report a &amp;bug</source>
-        <translation type="unfinished"></translation>
+        <translation>Report a &amp;bug</translation>
     </message>
     <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 type="unfinished"></translation>
+        <translation>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.</translation>
     </message>
     <message>
         <source>&amp;Import</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Import</translation>
     </message>
     <message>
         <source>Copy att&amp;ribute...</source>
-        <translation type="unfinished"></translation>
+        <translation>Copy att&amp;ribute...</translation>
     </message>
     <message>
         <source>TOTP...</source>
-        <translation type="unfinished"></translation>
+        <translation>TOTP...</translation>
     </message>
     <message>
         <source>&amp;New database...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;New database...</translation>
     </message>
     <message>
         <source>Create a new database</source>
-        <translation type="unfinished"></translation>
+        <translation>Create a new database</translation>
     </message>
     <message>
         <source>&amp;Merge from database...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Merge from database...</translation>
     </message>
     <message>
         <source>Merge from another KDBX database</source>
-        <translation type="unfinished"></translation>
+        <translation>Merge from another KDBX database</translation>
     </message>
     <message>
         <source>&amp;New entry</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;New entry</translation>
     </message>
     <message>
         <source>Add a new entry</source>
-        <translation type="unfinished"></translation>
+        <translation>Add a new entry</translation>
     </message>
     <message>
         <source>&amp;Edit entry</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Edit entry</translation>
     </message>
     <message>
         <source>View or edit entry</source>
-        <translation type="unfinished"></translation>
+        <translation>View or edit entry</translation>
     </message>
     <message>
         <source>&amp;New group</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;New group</translation>
     </message>
     <message>
         <source>Add a new group</source>
-        <translation type="unfinished"></translation>
+        <translation>Add a new group</translation>
     </message>
     <message>
         <source>Change master &amp;key...</source>
-        <translation type="unfinished"></translation>
+        <translation>Change master &amp;key...</translation>
     </message>
     <message>
         <source>&amp;Database settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Database settings...</translation>
     </message>
     <message>
         <source>Copy &amp;password</source>
-        <translation type="unfinished"></translation>
+        <translation>Copy &amp;password</translation>
     </message>
     <message>
         <source>Perform &amp;Auto-Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Perform &amp;Auto-Type</translation>
     </message>
     <message>
         <source>Open &amp;URL</source>
-        <translation type="unfinished"></translation>
+        <translation>Open &amp;URL</translation>
     </message>
     <message>
         <source>KeePass 1 database...</source>
-        <translation type="unfinished"></translation>
+        <translation>KeePass 1 database...</translation>
     </message>
     <message>
         <source>Import a KeePass 1 database</source>
-        <translation type="unfinished"></translation>
+        <translation>Import a KeePass 1 database</translation>
     </message>
     <message>
         <source>CSV file...</source>
-        <translation type="unfinished"></translation>
+        <translation>CSV file...</translation>
     </message>
     <message>
         <source>Import a CSV file</source>
-        <translation type="unfinished"></translation>
+        <translation>Import a CSV file</translation>
     </message>
     <message>
         <source>Show TOTP...</source>
-        <translation type="unfinished"></translation>
+        <translation>Show TOTP...</translation>
     </message>
     <message>
         <source>Show TOTP QR Code...</source>
-        <translation type="unfinished"></translation>
+        <translation>Show TOTP QR Code...</translation>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation>Check for Updates...</translation>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation>Share entry</translation>
+    </message>
+    <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>NOTE: You are using a pre-release version of KeePassXC!
+Expect some bugs and minor issues, this version is not meant for production use.</translation>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation>Check for updates on startup?</translation>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation>Would you like KeePassXC to check for updates on startup?</translation>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation>You can always check for updates manually from the application menu.</translation>
     </message>
 </context>
 <context>
     <name>Merger</name>
     <message>
         <source>Creating missing %1 [%2]</source>
-        <translation type="unfinished"></translation>
+        <translation>Creating missing %1 [%2]</translation>
     </message>
     <message>
         <source>Relocating %1 [%2]</source>
-        <translation type="unfinished"></translation>
+        <translation>Relocating %1 [%2]</translation>
     </message>
     <message>
         <source>Overwriting %1 [%2]</source>
-        <translation type="unfinished"></translation>
+        <translation>Overwriting %1 [%2]</translation>
     </message>
     <message>
         <source>older entry merged from database &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>older entry merged from database &quot;%1&quot;</translation>
     </message>
     <message>
         <source>Adding backup for older target %1 [%2]</source>
-        <translation type="unfinished"></translation>
+        <translation>Adding backup for older target %1 [%2]</translation>
     </message>
     <message>
         <source>Adding backup for older source %1 [%2]</source>
-        <translation type="unfinished"></translation>
+        <translation>Adding backup for older source %1 [%2]</translation>
     </message>
     <message>
         <source>Reapplying older target entry on top of newer source %1 [%2]</source>
-        <translation type="unfinished"></translation>
+        <translation>Reapplying older target entry on top of newer source %1 [%2]</translation>
     </message>
     <message>
         <source>Reapplying older source entry on top of newer target %1 [%2]</source>
-        <translation type="unfinished"></translation>
+        <translation>Reapplying older source entry on top of newer target %1 [%2]</translation>
     </message>
     <message>
         <source>Synchronizing from newer source %1 [%2]</source>
-        <translation type="unfinished"></translation>
+        <translation>Synchronizing from newer source %1 [%2]</translation>
     </message>
     <message>
         <source>Synchronizing from older source %1 [%2]</source>
-        <translation type="unfinished"></translation>
+        <translation>Synchronizing from older source %1 [%2]</translation>
     </message>
     <message>
         <source>Deleting child %1 [%2]</source>
-        <translation type="unfinished"></translation>
+        <translation>Deleting child %1 [%2]</translation>
     </message>
     <message>
         <source>Deleting orphan %1 [%2]</source>
-        <translation type="unfinished"></translation>
+        <translation>Deleting orphan %1 [%2]</translation>
     </message>
     <message>
         <source>Changed deleted objects</source>
-        <translation type="unfinished"></translation>
+        <translation>Changed deleted objects</translation>
     </message>
     <message>
         <source>Adding missing icon %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Adding missing icon %1</translation>
     </message>
 </context>
 <context>
     <name>NewDatabaseWizard</name>
     <message>
         <source>Create a new KeePassXC database...</source>
-        <translation type="unfinished"></translation>
+        <translation>Create a new KeePassXC database...</translation>
     </message>
     <message>
         <source>Root</source>
         <comment>Root group</comment>
-        <translation type="unfinished"></translation>
+        <translation>Root</translation>
     </message>
 </context>
 <context>
     <name>NewDatabaseWizardPage</name>
     <message>
         <source>WizardPage</source>
-        <translation type="unfinished"></translation>
+        <translation>WizardPage</translation>
     </message>
     <message>
         <source>En&amp;cryption Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>En&amp;cryption Settings</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 type="unfinished"></translation>
+        <translation>Here you can adjust the database encryption settings. Don&apos;t worry, you can change them later in the database settings.</translation>
     </message>
     <message>
         <source>Advanced Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Advanced Settings</translation>
     </message>
     <message>
         <source>Simple Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Simple Settings</translation>
     </message>
 </context>
 <context>
     <name>NewDatabaseWizardPageEncryption</name>
     <message>
         <source>Encryption Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Encryption Settings</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 type="unfinished"></translation>
+        <translation>Here you can adjust the database encryption settings. Don&apos;t worry, you can change them later in the database settings.</translation>
     </message>
 </context>
 <context>
     <name>NewDatabaseWizardPageMasterKey</name>
     <message>
         <source>Database Master Key</source>
-        <translation type="unfinished"></translation>
+        <translation>Database Master Key</translation>
     </message>
     <message>
         <source>A master key known only to you protects your database.</source>
-        <translation type="unfinished"></translation>
+        <translation>A master key known only to you protects your database.</translation>
     </message>
 </context>
 <context>
     <name>NewDatabaseWizardPageMetaData</name>
     <message>
         <source>General Database Information</source>
-        <translation type="unfinished"></translation>
+        <translation>General Database Information</translation>
     </message>
     <message>
         <source>Please fill in the display name and an optional description for your new database:</source>
-        <translation type="unfinished"></translation>
+        <translation>Please fill in the display name and an optional description for your new database:</translation>
     </message>
 </context>
 <context>
     <name>OpenSSHKey</name>
     <message>
         <source>Invalid key file, expecting an OpenSSH key</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid key file, expecting an OpenSSH key</translation>
     </message>
     <message>
         <source>PEM boundary mismatch</source>
-        <translation type="unfinished"></translation>
+        <translation>PEM boundary mismatch</translation>
     </message>
     <message>
         <source>Base64 decoding failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Base64 decoding failed</translation>
     </message>
     <message>
         <source>Key file way too small.</source>
-        <translation type="unfinished"></translation>
+        <translation>Key file way too small.</translation>
     </message>
     <message>
         <source>Key file magic header id invalid</source>
-        <translation type="unfinished"></translation>
+        <translation>Key file magic header id invalid</translation>
     </message>
     <message>
         <source>Found zero keys</source>
-        <translation type="unfinished"></translation>
+        <translation>Found zero keys</translation>
     </message>
     <message>
         <source>Failed to read public key.</source>
-        <translation type="unfinished"></translation>
+        <translation>Failed to read public key.</translation>
     </message>
     <message>
         <source>Corrupted key file, reading private key failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Corrupted key file, reading private key failed</translation>
     </message>
     <message>
         <source>No private key payload to decrypt</source>
-        <translation type="unfinished"></translation>
+        <translation>No private key payload to decrypt</translation>
     </message>
     <message>
         <source>Trying to run KDF without cipher</source>
-        <translation type="unfinished"></translation>
+        <translation>Trying to run KDF without cipher</translation>
     </message>
     <message>
         <source>Passphrase is required to decrypt this key</source>
-        <translation type="unfinished"></translation>
+        <translation>Passphrase is required to decrypt this key</translation>
     </message>
     <message>
         <source>Key derivation failed, key file corrupted?</source>
-        <translation type="unfinished"></translation>
+        <translation>Key derivation failed, key file corrupted?</translation>
     </message>
     <message>
         <source>Decryption failed, wrong passphrase?</source>
-        <translation type="unfinished"></translation>
+        <translation>Decryption failed, wrong passphrase?</translation>
     </message>
     <message>
         <source>Unexpected EOF while reading public key</source>
-        <translation type="unfinished"></translation>
+        <translation>Unexpected EOF while reading public key</translation>
     </message>
     <message>
         <source>Unexpected EOF while reading private key</source>
-        <translation type="unfinished"></translation>
+        <translation>Unexpected EOF while reading private key</translation>
     </message>
     <message>
         <source>Can&apos;t write public key as it is empty</source>
-        <translation type="unfinished"></translation>
+        <translation>Can&apos;t write public key as it is empty</translation>
     </message>
     <message>
         <source>Unexpected EOF when writing public key</source>
-        <translation type="unfinished"></translation>
+        <translation>Unexpected EOF when writing public key</translation>
     </message>
     <message>
         <source>Can&apos;t write private key as it is empty</source>
-        <translation type="unfinished"></translation>
+        <translation>Can&apos;t write private key as it is empty</translation>
     </message>
     <message>
         <source>Unexpected EOF when writing private key</source>
-        <translation type="unfinished"></translation>
+        <translation>Unexpected EOF when writing private key</translation>
     </message>
     <message>
         <source>Unsupported key type: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Unsupported key type: %1</translation>
     </message>
     <message>
         <source>Unknown cipher: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Unknown cipher: %1</translation>
     </message>
     <message>
         <source>Cipher IV is too short for MD5 kdf</source>
-        <translation type="unfinished"></translation>
+        <translation>Cipher IV is too short for MD5 kdf</translation>
     </message>
     <message>
         <source>Unknown KDF: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Unknown KDF: %1</translation>
     </message>
     <message>
         <source>Unknown key type: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Unknown key type: %1</translation>
     </message>
 </context>
 <context>
     <name>PasswordEditWidget</name>
     <message>
         <source>Enter password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Enter password:</translation>
     </message>
     <message>
         <source>Confirm password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Confirm password:</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Password</translation>
     </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>
+        <translation>&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;</translation>
     </message>
     <message>
         <source>Password cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation>Password cannot be empty.</translation>
     </message>
     <message>
         <source>Passwords do not match.</source>
-        <translation type="unfinished"></translation>
+        <translation>Passwords do not match.</translation>
     </message>
     <message>
         <source>Generate master password</source>
-        <translation type="unfinished"></translation>
+        <translation>Generate master password</translation>
     </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
     <message>
         <source>%p%</source>
-        <translation type="unfinished"></translation>
+        <translation>%p%</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Password:</translation>
     </message>
     <message>
         <source>strength</source>
         <comment>Password strength</comment>
-        <translation type="unfinished"></translation>
+        <translation>strength</translation>
     </message>
     <message>
         <source>entropy</source>
-        <translation type="unfinished"></translation>
+        <translation>entropy</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Password</translation>
     </message>
     <message>
         <source>Character Types</source>
-        <translation type="unfinished"></translation>
+        <translation>Character Types</translation>
     </message>
     <message>
         <source>Upper Case Letters</source>
-        <translation type="unfinished"></translation>
+        <translation>Upper Case Letters</translation>
     </message>
     <message>
         <source>Lower Case Letters</source>
-        <translation type="unfinished"></translation>
+        <translation>Lower Case Letters</translation>
     </message>
     <message>
         <source>Numbers</source>
-        <translation type="unfinished"></translation>
+        <translation>Numbers</translation>
     </message>
     <message>
         <source>Special Characters</source>
-        <translation type="unfinished"></translation>
+        <translation>Special Characters</translation>
     </message>
     <message>
         <source>Extended ASCII</source>
-        <translation type="unfinished"></translation>
+        <translation>Extended ASCII</translation>
     </message>
     <message>
         <source>Exclude look-alike characters</source>
-        <translation type="unfinished"></translation>
+        <translation>Exclude look-alike characters</translation>
     </message>
     <message>
         <source>Pick characters from every group</source>
-        <translation type="unfinished"></translation>
+        <translation>Pick characters from every group</translation>
     </message>
     <message>
         <source>&amp;Length:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Length:</translation>
     </message>
     <message>
         <source>Passphrase</source>
-        <translation type="unfinished"></translation>
+        <translation>Passphrase</translation>
     </message>
     <message>
         <source>Wordlist:</source>
-        <translation type="unfinished"></translation>
+        <translation>Wordlist:</translation>
     </message>
     <message>
         <source>Word Separator:</source>
-        <translation type="unfinished"></translation>
+        <translation>Word Separator:</translation>
     </message>
     <message>
         <source>Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Copy</translation>
     </message>
     <message>
         <source>Accept</source>
-        <translation type="unfinished"></translation>
+        <translation>Accept</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Close</translation>
     </message>
     <message>
         <source>Entropy: %1 bit</source>
-        <translation type="unfinished"></translation>
+        <translation>Entropy: %1 bit</translation>
     </message>
     <message>
         <source>Password Quality: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Password Quality: %1</translation>
     </message>
     <message>
         <source>Poor</source>
         <comment>Password quality</comment>
-        <translation type="unfinished"></translation>
+        <translation>Poor</translation>
     </message>
     <message>
         <source>Weak</source>
         <comment>Password quality</comment>
-        <translation type="unfinished"></translation>
+        <translation>Weak</translation>
     </message>
     <message>
         <source>Good</source>
         <comment>Password quality</comment>
-        <translation type="unfinished"></translation>
+        <translation>Good</translation>
     </message>
     <message>
         <source>Excellent</source>
         <comment>Password quality</comment>
-        <translation type="unfinished"></translation>
+        <translation>Excellent</translation>
     </message>
     <message>
         <source>ExtendedASCII</source>
-        <translation type="unfinished"></translation>
+        <translation>ExtendedASCII</translation>
     </message>
     <message>
         <source>Switch to advanced mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Switch to advanced mode</translation>
     </message>
     <message>
         <source>Advanced</source>
-        <translation type="unfinished"></translation>
+        <translation>Advanced</translation>
     </message>
     <message>
         <source>Upper Case Letters A to F</source>
-        <translation type="unfinished"></translation>
+        <translation>Upper Case Letters A to F</translation>
     </message>
     <message>
         <source>A-Z</source>
-        <translation type="unfinished"></translation>
+        <translation>A-Z</translation>
     </message>
     <message>
         <source>Lower Case Letters A to F</source>
-        <translation type="unfinished"></translation>
+        <translation>Lower Case Letters A to F</translation>
     </message>
     <message>
         <source>a-z</source>
-        <translation type="unfinished"></translation>
+        <translation>a-z</translation>
     </message>
     <message>
         <source>0-9</source>
-        <translation type="unfinished"></translation>
+        <translation>0-9</translation>
     </message>
     <message>
         <source>Braces</source>
-        <translation type="unfinished"></translation>
+        <translation>Braces</translation>
     </message>
     <message>
         <source>{[(</source>
-        <translation type="unfinished"></translation>
+        <translation>{[(</translation>
     </message>
     <message>
         <source>Punctuation</source>
-        <translation type="unfinished"></translation>
+        <translation>Punctuation</translation>
     </message>
     <message>
         <source>.,:;</source>
-        <translation type="unfinished"></translation>
+        <translation>.,:;</translation>
     </message>
     <message>
         <source>Quotes</source>
-        <translation type="unfinished"></translation>
+        <translation>Quotes</translation>
     </message>
     <message>
         <source>&quot; &apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot; &apos;</translation>
     </message>
     <message>
         <source>Math</source>
-        <translation type="unfinished"></translation>
+        <translation>Math</translation>
     </message>
     <message>
         <source>&lt;*+!?=</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;*+!?=</translation>
     </message>
     <message>
         <source>Dashes</source>
-        <translation type="unfinished"></translation>
+        <translation>Dashes</translation>
     </message>
     <message>
         <source>\_|-/</source>
-        <translation type="unfinished"></translation>
+        <translation>\_|-/</translation>
     </message>
     <message>
         <source>Logograms</source>
-        <translation type="unfinished"></translation>
+        <translation>Logograms</translation>
     </message>
     <message>
         <source>#$%&amp;&amp;@^`~</source>
-        <translation type="unfinished"></translation>
+        <translation>#$%&amp;&amp;@^`~</translation>
     </message>
     <message>
         <source>Switch to simple mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Switch to simple mode</translation>
     </message>
     <message>
         <source>Simple</source>
-        <translation type="unfinished"></translation>
+        <translation>Simple</translation>
     </message>
     <message>
         <source>Character set to exclude from generated password</source>
-        <translation type="unfinished"></translation>
+        <translation>Character set to exclude from generated password</translation>
     </message>
     <message>
         <source>Do not include:</source>
-        <translation type="unfinished"></translation>
+        <translation>Do not include:</translation>
     </message>
     <message>
         <source>Add non-hex letters to &quot;do not include&quot; list</source>
-        <translation type="unfinished"></translation>
+        <translation>Add non-hex letters to &quot;do not include&quot; list</translation>
     </message>
     <message>
         <source>Hex</source>
-        <translation type="unfinished"></translation>
+        <translation>Hex</translation>
     </message>
     <message>
         <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</translation>
     </message>
     <message>
         <source>Word Co&amp;unt:</source>
-        <translation type="unfinished"></translation>
+        <translation>Word Co&amp;unt:</translation>
     </message>
     <message>
         <source>Regenerate</source>
-        <translation type="unfinished"></translation>
+        <translation>Regenerate</translation>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation>KeeShare</translation>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation>Select</translation>
     </message>
 </context>
 <context>
-    <name>QCoreApplication</name>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation>Overwrite</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Delete</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation>Move</translation>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation>Empty</translation>
+    </message>
     <message>
-        <source>main</source>
-        <comment>Remove an entry from the database.</comment>
-        <translation type="unfinished"></translation>
+        <source>Remove</source>
+        <translation>Remove</translation>
     </message>
     <message>
-        <source>main</source>
-        <comment>Path of the database.</comment>
-        <translation type="unfinished"></translation>
+        <source>Skip</source>
+        <translation>Skip</translation>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Disable</translation>
     </message>
     <message>
-        <source>main</source>
-        <comment>Path of the entry to remove.</comment>
-        <translation type="unfinished"></translation>
+        <source>Merge</source>
+        <translation>Merge</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Database not opened</source>
-        <translation type="unfinished"></translation>
+        <translation>Database not opened</translation>
     </message>
     <message>
         <source>Database hash not available</source>
-        <translation type="unfinished"></translation>
+        <translation>Database hash not available</translation>
     </message>
     <message>
         <source>Client public key not received</source>
-        <translation type="unfinished"></translation>
+        <translation>Client public key not received</translation>
     </message>
     <message>
         <source>Cannot decrypt message</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
-        <translation type="unfinished"></translation>
+        <translation>Cannot decrypt message</translation>
     </message>
     <message>
         <source>Action cancelled or denied</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation type="unfinished"></translation>
+        <translation>Action cancelled or denied</translation>
     </message>
     <message>
         <source>KeePassXC association failed, try again</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key change was not successful</source>
-        <translation type="unfinished"></translation>
+        <translation>KeePassXC association failed, try again</translation>
     </message>
     <message>
         <source>Encryption key is not recognized</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No saved databases found</source>
-        <translation type="unfinished"></translation>
+        <translation>Encryption key is not recognized</translation>
     </message>
     <message>
         <source>Incorrect action</source>
-        <translation type="unfinished"></translation>
+        <translation>Incorrect action</translation>
     </message>
     <message>
         <source>Empty message received</source>
-        <translation type="unfinished"></translation>
+        <translation>Empty message received</translation>
     </message>
     <message>
         <source>No URL provided</source>
-        <translation type="unfinished"></translation>
+        <translation>No URL provided</translation>
     </message>
     <message>
         <source>No logins found</source>
-        <translation type="unfinished"></translation>
+        <translation>No logins found</translation>
     </message>
     <message>
         <source>Unknown error</source>
-        <translation type="unfinished"></translation>
+        <translation>Unknown error</translation>
     </message>
     <message>
         <source>Add a new entry to a database.</source>
-        <translation type="unfinished"></translation>
+        <translation>Add a new entry to a database.</translation>
     </message>
     <message>
         <source>Path of the database.</source>
-        <translation type="unfinished"></translation>
+        <translation>Path of the database.</translation>
     </message>
     <message>
         <source>Key file of the database.</source>
-        <translation type="unfinished"></translation>
+        <translation>Key file of the database.</translation>
     </message>
     <message>
         <source>path</source>
-        <translation type="unfinished"></translation>
+        <translation>path</translation>
     </message>
     <message>
         <source>Username for the entry.</source>
-        <translation type="unfinished"></translation>
+        <translation>Username for the entry.</translation>
     </message>
     <message>
         <source>username</source>
-        <translation type="unfinished"></translation>
+        <translation>username</translation>
     </message>
     <message>
         <source>URL for the entry.</source>
-        <translation type="unfinished"></translation>
+        <translation>URL for the entry.</translation>
     </message>
     <message>
         <source>URL</source>
-        <translation type="unfinished"></translation>
+        <translation>URL</translation>
     </message>
     <message>
         <source>Prompt for the entry&apos;s password.</source>
-        <translation type="unfinished"></translation>
+        <translation>Prompt for the entry&apos;s password.</translation>
     </message>
     <message>
         <source>Generate a password for the entry.</source>
-        <translation type="unfinished"></translation>
+        <translation>Generate a password for the entry.</translation>
     </message>
     <message>
         <source>Length for the generated password.</source>
-        <translation type="unfinished"></translation>
+        <translation>Length for the generated password.</translation>
     </message>
     <message>
         <source>length</source>
-        <translation type="unfinished"></translation>
+        <translation>length</translation>
     </message>
     <message>
         <source>Path of the entry to add.</source>
-        <translation type="unfinished"></translation>
+        <translation>Path of the entry to add.</translation>
     </message>
     <message>
         <source>Copy an entry&apos;s password to the clipboard.</source>
-        <translation type="unfinished"></translation>
+        <translation>Copy an entry&apos;s password to the clipboard.</translation>
     </message>
     <message>
         <source>Path of the entry to clip.</source>
         <comment>clip = copy to clipboard</comment>
-        <translation type="unfinished"></translation>
+        <translation>Path of the entry to clip.</translation>
     </message>
     <message>
         <source>Timeout in seconds before clearing the clipboard.</source>
-        <translation type="unfinished"></translation>
+        <translation>Timeout in seconds before clearing the clipboard.</translation>
     </message>
     <message>
         <source>Edit an entry.</source>
-        <translation type="unfinished"></translation>
+        <translation>Edit an entry.</translation>
     </message>
     <message>
         <source>Title for the entry.</source>
-        <translation type="unfinished"></translation>
+        <translation>Title for the entry.</translation>
     </message>
     <message>
         <source>title</source>
-        <translation type="unfinished"></translation>
+        <translation>title</translation>
     </message>
     <message>
         <source>Path of the entry to edit.</source>
-        <translation type="unfinished"></translation>
+        <translation>Path of the entry to edit.</translation>
     </message>
     <message>
         <source>Estimate the entropy of a password.</source>
-        <translation type="unfinished"></translation>
+        <translation>Estimate the entropy of a password.</translation>
     </message>
     <message>
         <source>Password for which to estimate the entropy.</source>
-        <translation type="unfinished"></translation>
+        <translation>Password for which to estimate the entropy.</translation>
     </message>
     <message>
         <source>Perform advanced analysis on the password.</source>
-        <translation type="unfinished"></translation>
+        <translation>Perform advanced analysis on the password.</translation>
     </message>
     <message>
         <source>Extract and print the content of a database.</source>
-        <translation type="unfinished"></translation>
+        <translation>Extract and print the content of a database.</translation>
     </message>
     <message>
         <source>Path of the database to extract.</source>
-        <translation type="unfinished"></translation>
+        <translation>Path of the database to extract.</translation>
     </message>
     <message>
         <source>Insert password to unlock %1: </source>
-        <translation type="unfinished"></translation>
+        <translation>Insert password to unlock %1: </translation>
     </message>
     <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
 Please consider generating a new key file.</source>
-        <translation type="unfinished"></translation>
+        <translation>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</translation>
     </message>
     <message>
         <source>
 
 Available commands:
 </source>
-        <translation type="unfinished"></translation>
+        <translation>
+
+Available commands:
+</translation>
     </message>
     <message>
         <source>Name of the command to execute.</source>
-        <translation type="unfinished"></translation>
+        <translation>Name of the command to execute.</translation>
     </message>
     <message>
         <source>List database entries.</source>
-        <translation type="unfinished"></translation>
+        <translation>List database entries.</translation>
     </message>
     <message>
         <source>Path of the group to list. Default is /</source>
-        <translation type="unfinished"></translation>
+        <translation>Path of the group to list. Default is /</translation>
     </message>
     <message>
         <source>Find entries quickly.</source>
-        <translation type="unfinished"></translation>
+        <translation>Find entries quickly.</translation>
     </message>
     <message>
         <source>Search term.</source>
-        <translation type="unfinished"></translation>
+        <translation>Search term.</translation>
     </message>
     <message>
         <source>Merge two databases.</source>
-        <translation type="unfinished"></translation>
+        <translation>Merge two databases.</translation>
     </message>
     <message>
         <source>Path of the database to merge into.</source>
-        <translation type="unfinished"></translation>
+        <translation>Path of the database to merge into.</translation>
     </message>
     <message>
         <source>Path of the database to merge from.</source>
-        <translation type="unfinished"></translation>
+        <translation>Path of the database to merge from.</translation>
     </message>
     <message>
         <source>Use the same credentials for both database files.</source>
-        <translation type="unfinished"></translation>
+        <translation>Use the same credentials for both database files.</translation>
     </message>
     <message>
         <source>Key file of the database to merge from.</source>
-        <translation type="unfinished"></translation>
+        <translation>Key file of the database to merge from.</translation>
     </message>
     <message>
         <source>Show an entry&apos;s information.</source>
-        <translation type="unfinished"></translation>
+        <translation>Show an entry&apos;s information.</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>
-        <translation type="unfinished"></translation>
+        <translation>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.</translation>
     </message>
     <message>
         <source>attribute</source>
-        <translation type="unfinished"></translation>
+        <translation>attribute</translation>
     </message>
     <message>
         <source>Name of the entry to show.</source>
-        <translation type="unfinished"></translation>
+        <translation>Name of the entry to show.</translation>
     </message>
     <message>
         <source>NULL device</source>
-        <translation type="unfinished"></translation>
+        <translation>NULL device</translation>
     </message>
     <message>
         <source>error reading from device</source>
-        <translation type="unfinished"></translation>
+        <translation>error reading from device</translation>
     </message>
     <message>
         <source>malformed string</source>
-        <translation type="unfinished"></translation>
+        <translation>malformed string</translation>
     </message>
     <message>
         <source>missing closing quote</source>
-        <translation type="unfinished"></translation>
+        <translation>missing closing quote</translation>
     </message>
     <message>
         <source>Group</source>
-        <translation type="unfinished"></translation>
+        <translation>Group</translation>
     </message>
     <message>
         <source>Title</source>
-        <translation type="unfinished"></translation>
+        <translation>Title</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished"></translation>
+        <translation>Username</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Password</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation>Notes</translation>
     </message>
     <message>
         <source>Last Modified</source>
-        <translation type="unfinished"></translation>
+        <translation>Last Modified</translation>
     </message>
     <message>
         <source>Created</source>
-        <translation type="unfinished"></translation>
+        <translation>Created</translation>
     </message>
     <message>
         <source>Browser Integration</source>
-        <translation type="unfinished"></translation>
+        <translation>Browser Integration</translation>
     </message>
     <message>
         <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
-        <translation type="unfinished"></translation>
+        <translation>YubiKey[%1] Challenge Response - Slot %2 - %3</translation>
     </message>
     <message>
         <source>Press</source>
-        <translation type="unfinished"></translation>
+        <translation>Press</translation>
     </message>
     <message>
         <source>Passive</source>
-        <translation type="unfinished"></translation>
+        <translation>Passive</translation>
     </message>
     <message>
         <source>SSH Agent</source>
-        <translation type="unfinished"></translation>
+        <translation>SSH Agent</translation>
     </message>
     <message>
         <source>Generate a new random diceware passphrase.</source>
-        <translation type="unfinished"></translation>
+        <translation>Generate a new random diceware passphrase.</translation>
     </message>
     <message>
         <source>Word count for the diceware passphrase.</source>
-        <translation type="unfinished"></translation>
+        <translation>Word count for the diceware passphrase.</translation>
     </message>
     <message>
         <source>Wordlist for the diceware generator.
 [Default: EFF English]</source>
-        <translation type="unfinished"></translation>
+        <translation>Wordlist for the diceware generator.
+[Default: EFF English]</translation>
     </message>
     <message>
         <source>Generate a new random password.</source>
-        <translation type="unfinished"></translation>
+        <translation>Generate a new random password.</translation>
     </message>
     <message>
         <source>Invalid value for password length %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid value for password length %1.</translation>
     </message>
     <message>
         <source>Could not create entry with path %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Could not create entry with path %1.</translation>
     </message>
     <message>
         <source>Enter password for new entry: </source>
-        <translation type="unfinished"></translation>
+        <translation>Enter password for new entry: </translation>
     </message>
     <message>
         <source>Writing the database failed %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Writing the database failed %1.</translation>
     </message>
     <message>
         <source>Successfully added entry %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Successfully added entry %1.</translation>
     </message>
     <message>
         <source>Copy the current TOTP to the clipboard.</source>
-        <translation type="unfinished"></translation>
+        <translation>Copy the current TOTP to the clipboard.</translation>
     </message>
     <message>
         <source>Invalid timeout value %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid timeout value %1.</translation>
     </message>
     <message>
         <source>Entry %1 not found.</source>
-        <translation type="unfinished"></translation>
+        <translation>Entry %1 not found.</translation>
     </message>
     <message>
         <source>Entry with path %1 has no TOTP set up.</source>
-        <translation type="unfinished"></translation>
+        <translation>Entry with path %1 has no TOTP set up.</translation>
     </message>
     <message>
         <source>Entry&apos;s current TOTP copied to the clipboard!</source>
-        <translation type="unfinished"></translation>
+        <translation>Entry&apos;s current TOTP copied to the clipboard!</translation>
     </message>
     <message>
         <source>Entry&apos;s password copied to the clipboard!</source>
-        <translation type="unfinished"></translation>
+        <translation>Entry&apos;s password copied to the clipboard!</translation>
     </message>
     <message numerus="yes">
         <source>Clearing the clipboard in %1 second(s)...</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation><numerusform>Clearing the clipboard in %1 second(s)...</numerusform><numerusform>Clearing the clipboard in %1 second(s)...</numerusform></translation>
     </message>
     <message>
         <source>Clipboard cleared!</source>
-        <translation type="unfinished"></translation>
+        <translation>Clipboard cleared!</translation>
     </message>
     <message>
         <source>Silence password prompt and other secondary outputs.</source>
-        <translation type="unfinished"></translation>
+        <translation>Silence password prompt and other secondary outputs.</translation>
     </message>
     <message>
         <source>count</source>
         <comment>CLI parameter</comment>
-        <translation type="unfinished"></translation>
+        <translation>count</translation>
     </message>
     <message>
         <source>Invalid value for password length: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Invalid value for password length: %1</translation>
     </message>
     <message>
         <source>Could not find entry with path %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Could not find entry with path %1.</translation>
     </message>
     <message>
         <source>Not changing any field for entry %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Not changing any field for entry %1.</translation>
     </message>
     <message>
         <source>Enter new password for entry: </source>
-        <translation type="unfinished"></translation>
+        <translation>Enter new password for entry: </translation>
     </message>
     <message>
         <source>Writing the database failed: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Writing the database failed: %1</translation>
     </message>
     <message>
         <source>Successfully edited entry %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Successfully edited entry %1.</translation>
     </message>
     <message>
         <source>Length %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Length %1</translation>
     </message>
     <message>
         <source>Entropy %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Entropy %1</translation>
     </message>
     <message>
         <source>Log10 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Log10 %1</translation>
     </message>
     <message>
         <source>Multi-word extra bits %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Multi-word extra bits %1</translation>
     </message>
     <message>
         <source>Type: Bruteforce</source>
-        <translation type="unfinished"></translation>
+        <translation>Type: Bruteforce</translation>
     </message>
     <message>
         <source>Type: Dictionary</source>
-        <translation type="unfinished"></translation>
+        <translation>Type: Dictionary</translation>
     </message>
     <message>
         <source>Type: Dict+Leet</source>
-        <translation type="unfinished"></translation>
+        <translation>Type: Dict+Leet</translation>
     </message>
     <message>
         <source>Type: User Words</source>
-        <translation type="unfinished"></translation>
+        <translation>Type: User Words</translation>
     </message>
     <message>
         <source>Type: User+Leet</source>
-        <translation type="unfinished"></translation>
+        <translation>Type: User+Leet</translation>
     </message>
     <message>
         <source>Type: Repeated</source>
-        <translation type="unfinished"></translation>
+        <translation>Type: Repeated</translation>
     </message>
     <message>
         <source>Type: Sequence</source>
-        <translation type="unfinished"></translation>
+        <translation>Type: Sequence</translation>
     </message>
     <message>
         <source>Type: Spatial</source>
-        <translation type="unfinished"></translation>
+        <translation>Type: Spatial</translation>
     </message>
     <message>
         <source>Type: Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Type: Date</translation>
     </message>
     <message>
         <source>Type: Bruteforce(Rep)</source>
-        <translation type="unfinished"></translation>
+        <translation>Type: Bruteforce(Rep)</translation>
     </message>
     <message>
         <source>Type: Dictionary(Rep)</source>
-        <translation type="unfinished"></translation>
+        <translation>Type: Dictionary(Rep)</translation>
     </message>
     <message>
         <source>Type: Dict+Leet(Rep)</source>
-        <translation type="unfinished"></translation>
+        <translation>Type: Dict+Leet(Rep)</translation>
     </message>
     <message>
         <source>Type: User Words(Rep)</source>
-        <translation type="unfinished"></translation>
+        <translation>Type: User Words(Rep)</translation>
     </message>
     <message>
         <source>Type: User+Leet(Rep)</source>
-        <translation type="unfinished"></translation>
+        <translation>Type: User+Leet(Rep)</translation>
     </message>
     <message>
         <source>Type: Repeated(Rep)</source>
-        <translation type="unfinished"></translation>
+        <translation>Type: Repeated(Rep)</translation>
     </message>
     <message>
         <source>Type: Sequence(Rep)</source>
-        <translation type="unfinished"></translation>
+        <translation>Type: Sequence(Rep)</translation>
     </message>
     <message>
         <source>Type: Spatial(Rep)</source>
-        <translation type="unfinished"></translation>
+        <translation>Type: Spatial(Rep)</translation>
     </message>
     <message>
         <source>Type: Date(Rep)</source>
-        <translation type="unfinished"></translation>
+        <translation>Type: Date(Rep)</translation>
     </message>
     <message>
         <source>Type: Unknown%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Type: Unknown%1</translation>
     </message>
     <message>
         <source>Entropy %1 (%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>Entropy %1 (%2)</translation>
     </message>
     <message>
         <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
-        <translation type="unfinished"></translation>
+        <translation>*** Password length (%1) != sum of length of parts (%2) ***</translation>
     </message>
     <message>
         <source>Failed to load key file %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Failed to load key file %1: %2</translation>
     </message>
     <message>
         <source>File %1 does not exist.</source>
-        <translation type="unfinished"></translation>
+        <translation>File %1 does not exist.</translation>
     </message>
     <message>
         <source>Unable to open file %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Unable to open file %1.</translation>
     </message>
     <message>
         <source>Error while reading the database:
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Error while reading the database:
+%1</translation>
     </message>
     <message>
         <source>Error while parsing the database:
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Error while parsing the database:
+%1</translation>
     </message>
     <message>
         <source>Length of the generated password</source>
-        <translation type="unfinished"></translation>
+        <translation>Length of the generated password</translation>
     </message>
     <message>
         <source>Use lowercase characters</source>
-        <translation type="unfinished"></translation>
+        <translation>Use lowercase characters</translation>
     </message>
     <message>
         <source>Use uppercase characters</source>
-        <translation type="unfinished"></translation>
+        <translation>Use uppercase characters</translation>
     </message>
     <message>
         <source>Use numbers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Use numbers.</translation>
     </message>
     <message>
         <source>Use special characters</source>
-        <translation type="unfinished"></translation>
+        <translation>Use special characters</translation>
     </message>
     <message>
         <source>Use extended ASCII</source>
-        <translation type="unfinished"></translation>
+        <translation>Use extended ASCII</translation>
     </message>
     <message>
         <source>Exclude character set</source>
-        <translation type="unfinished"></translation>
+        <translation>Exclude character set</translation>
     </message>
     <message>
         <source>chars</source>
-        <translation type="unfinished"></translation>
+        <translation>chars</translation>
     </message>
     <message>
         <source>Exclude similar looking characters</source>
-        <translation type="unfinished"></translation>
+        <translation>Exclude similar looking characters</translation>
     </message>
     <message>
         <source>Include characters from every selected group</source>
-        <translation type="unfinished"></translation>
+        <translation>Include characters from every selected group</translation>
     </message>
     <message>
         <source>Recursively list the elements of the group.</source>
-        <translation type="unfinished"></translation>
+        <translation>Recursively list the elements of the group.</translation>
     </message>
     <message>
         <source>Cannot find group %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Cannot find group %1.</translation>
     </message>
     <message>
         <source>Error reading merge file:
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Error reading merge file:
+%1</translation>
     </message>
     <message>
         <source>Unable to save database to file : %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Unable to save database to file : %1</translation>
     </message>
     <message>
         <source>Unable to save database to file: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Unable to save database to file: %1</translation>
     </message>
     <message>
         <source>Successfully recycled entry %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Successfully recycled entry %1.</translation>
     </message>
     <message>
         <source>Successfully deleted entry %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Successfully deleted entry %1.</translation>
     </message>
     <message>
         <source>Show the entry&apos;s current TOTP.</source>
-        <translation type="unfinished"></translation>
+        <translation>Show the entry&apos;s current TOTP.</translation>
     </message>
     <message>
         <source>ERROR: unknown attribute %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>ERROR: unknown attribute %1.</translation>
     </message>
     <message>
         <source>No program defined for clipboard manipulation</source>
-        <translation type="unfinished"></translation>
+        <translation>No program defined for clipboard manipulation</translation>
     </message>
     <message>
         <source>Unable to start program %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Unable to start program %1</translation>
     </message>
     <message>
         <source>file empty</source>
-        <translation type="unfinished"></translation>
+        <translation>file empty</translation>
     </message>
     <message>
         <source>%1: (row, col) %2,%3</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: (row, col) %2,%3</translation>
     </message>
     <message>
         <source>AES: 256-bit</source>
-        <translation type="unfinished"></translation>
+        <translation>AES: 256-bit</translation>
     </message>
     <message>
         <source>Twofish: 256-bit</source>
-        <translation type="unfinished"></translation>
+        <translation>Twofish: 256-bit</translation>
     </message>
     <message>
         <source>ChaCha20: 256-bit</source>
-        <translation type="unfinished"></translation>
+        <translation>ChaCha20: 256-bit</translation>
     </message>
     <message>
         <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation type="unfinished"></translation>
+        <translation>Argon2 (KDBX 4 – recommended)</translation>
     </message>
     <message>
         <source>AES-KDF (KDBX 4)</source>
-        <translation type="unfinished"></translation>
+        <translation>AES-KDF (KDBX 4)</translation>
     </message>
     <message>
         <source>AES-KDF (KDBX 3.1)</source>
-        <translation type="unfinished"></translation>
+        <translation>AES-KDF (KDBX 3.1)</translation>
     </message>
     <message>
         <source>Invalid Settings</source>
         <comment>TOTP</comment>
-        <translation type="unfinished"></translation>
+        <translation>Invalid Settings</translation>
     </message>
     <message>
         <source>Invalid Key</source>
         <comment>TOTP</comment>
-        <translation type="unfinished"></translation>
+        <translation>Invalid Key</translation>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation>Message encryption failed.</translation>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation>No groups found</translation>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation>Create a new database.</translation>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation>File %1 already exists.</translation>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation>Loading the key file failed</translation>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation>No key is set. Aborting database creation.</translation>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation>Failed to save the database: %1.</translation>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation>Successfully created new database.</translation>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation>Insert password to encrypt database (Press enter to leave blank): </translation>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation>Creating KeyFile %1 failed: %2</translation>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation>Loading KeyFile %1 failed: %2</translation>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>Remove an entry from the database.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>Path of the entry to remove.</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>Existing single-instance lock file is invalid. Launching new instance.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>The lock file could not be created. Single-instance mode disabled.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - cross-platform password manager</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>filenames of the password databases to open (*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>path to a custom config file</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>key file of the database</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>read password of the database from stdin</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation>Parent window handle</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Another instance of KeePassXC is already running.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Fatal error while testing the cryptographic functions.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Error</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation>Database password: </translation>
     </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
     <message>
         <source>Internal zlib error when compressing: </source>
-        <translation type="unfinished"></translation>
+        <translation>Internal zlib error when compressing: </translation>
     </message>
     <message>
         <source>Error writing to underlying device: </source>
-        <translation type="unfinished"></translation>
+        <translation>Error writing to underlying device: </translation>
     </message>
     <message>
         <source>Error opening underlying device: </source>
-        <translation type="unfinished"></translation>
+        <translation>Error opening underlying device: </translation>
     </message>
     <message>
         <source>Error reading data from underlying device: </source>
-        <translation type="unfinished"></translation>
+        <translation>Error reading data from underlying device: </translation>
     </message>
     <message>
         <source>Internal zlib error when decompressing: </source>
-        <translation type="unfinished"></translation>
+        <translation>Internal zlib error when decompressing: </translation>
     </message>
 </context>
 <context>
     <name>QtIOCompressor::open</name>
     <message>
         <source>The gzip format not supported in this version of zlib.</source>
-        <translation type="unfinished"></translation>
+        <translation>The gzip format not supported in this version of zlib.</translation>
     </message>
     <message>
         <source>Internal zlib error: </source>
-        <translation type="unfinished"></translation>
+        <translation>Internal zlib error: </translation>
     </message>
 </context>
 <context>
     <name>SSHAgent</name>
     <message>
         <source>Agent connection failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Agent connection failed.</translation>
     </message>
     <message>
         <source>Agent protocol error.</source>
-        <translation type="unfinished"></translation>
+        <translation>Agent protocol error.</translation>
     </message>
     <message>
         <source>No agent running, cannot add identity.</source>
-        <translation type="unfinished"></translation>
+        <translation>No agent running, cannot add identity.</translation>
     </message>
     <message>
         <source>No agent running, cannot remove identity.</source>
-        <translation type="unfinished"></translation>
+        <translation>No agent running, cannot remove identity.</translation>
     </message>
     <message>
         <source>Agent refused this identity. Possible reasons include:</source>
-        <translation type="unfinished"></translation>
+        <translation>Agent refused this identity. Possible reasons include:</translation>
     </message>
     <message>
         <source>The key has already been added.</source>
-        <translation type="unfinished"></translation>
+        <translation>The key has already been added.</translation>
     </message>
     <message>
         <source>Restricted lifetime is not supported by the agent (check options).</source>
-        <translation type="unfinished"></translation>
+        <translation>Restricted lifetime is not supported by the agent (check options).</translation>
     </message>
     <message>
         <source>A confirmation request is not supported by the agent (check options).</source>
-        <translation type="unfinished"></translation>
+        <translation>A confirmation request is not supported by the agent (check options).</translation>
     </message>
 </context>
 <context>
     <name>SearchHelpWidget</name>
     <message>
         <source>Search Help</source>
-        <translation type="unfinished"></translation>
+        <translation>Search Help</translation>
     </message>
     <message>
         <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
-        <translation type="unfinished"></translation>
+        <translation>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</translation>
     </message>
     <message>
         <source>Every search term must match (ie, logical AND)</source>
-        <translation type="unfinished"></translation>
+        <translation>Every search term must match (ie, logical AND)</translation>
     </message>
     <message>
         <source>Modifiers</source>
-        <translation type="unfinished"></translation>
+        <translation>Modifiers</translation>
     </message>
     <message>
         <source>exclude term from results</source>
-        <translation type="unfinished"></translation>
+        <translation>exclude term from results</translation>
     </message>
     <message>
         <source>match term exactly</source>
-        <translation type="unfinished"></translation>
+        <translation>match term exactly</translation>
     </message>
     <message>
         <source>use regex in term</source>
-        <translation type="unfinished"></translation>
+        <translation>use regex in term</translation>
     </message>
     <message>
         <source>Fields</source>
-        <translation type="unfinished"></translation>
+        <translation>Fields</translation>
     </message>
     <message>
         <source>Term Wildcards</source>
-        <translation type="unfinished"></translation>
+        <translation>Term Wildcards</translation>
     </message>
     <message>
         <source>match anything</source>
-        <translation type="unfinished"></translation>
+        <translation>match anything</translation>
     </message>
     <message>
         <source>match one</source>
-        <translation type="unfinished"></translation>
+        <translation>match one</translation>
     </message>
     <message>
         <source>logical OR</source>
-        <translation type="unfinished"></translation>
+        <translation>logical OR</translation>
     </message>
     <message>
         <source>Examples</source>
-        <translation type="unfinished"></translation>
+        <translation>Examples</translation>
     </message>
 </context>
 <context>
     <name>SearchWidget</name>
     <message>
         <source>Search</source>
-        <translation type="unfinished"></translation>
+        <translation>Search</translation>
     </message>
     <message>
         <source>Clear</source>
-        <translation type="unfinished"></translation>
+        <translation>Clear</translation>
     </message>
     <message>
         <source>Limit search to selected group</source>
-        <translation type="unfinished"></translation>
+        <translation>Limit search to selected group</translation>
     </message>
     <message>
         <source>Search Help</source>
-        <translation type="unfinished"></translation>
+        <translation>Search Help</translation>
     </message>
     <message>
         <source>Search (%1)...</source>
         <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
-        <translation type="unfinished"></translation>
+        <translation>Search (%1)...</translation>
     </message>
     <message>
         <source>Case sensitive</source>
-        <translation type="unfinished"></translation>
+        <translation>Case sensitive</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsWidgetKeeShare</name>
+    <message>
+        <source>Active</source>
+        <translation>Active</translation>
+    </message>
+    <message>
+        <source>Allow export</source>
+        <translation>Allow export</translation>
+    </message>
+    <message>
+        <source>Allow import</source>
+        <translation>Allow import</translation>
+    </message>
+    <message>
+        <source>Own certificate</source>
+        <translation>Own certificate</translation>
+    </message>
+    <message>
+        <source>Fingerprint:</source>
+        <translation>Fingerprint:</translation>
+    </message>
+    <message>
+        <source>Certificate:</source>
+        <translation>Certificate:</translation>
+    </message>
+    <message>
+        <source>Signer</source>
+        <translation>Signer</translation>
+    </message>
+    <message>
+        <source>Key:</source>
+        <translation>Key:</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Generate</translation>
+    </message>
+    <message>
+        <source>Import</source>
+        <translation>Import</translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation>Export</translation>
+    </message>
+    <message>
+        <source>Imported certificates</source>
+        <translation>Imported certificates</translation>
+    </message>
+    <message>
+        <source>Trust</source>
+        <translation>Trust</translation>
+    </message>
+    <message>
+        <source>Ask</source>
+        <translation>Ask</translation>
+    </message>
+    <message>
+        <source>Untrust</source>
+        <translation>Untrust</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Remove</translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation>Path</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>Status</translation>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation>Fingerprint</translation>
+    </message>
+    <message>
+        <source>Certificate</source>
+        <translation>Certificate</translation>
+    </message>
+    <message>
+        <source>Trusted</source>
+        <translation>Trusted</translation>
+    </message>
+    <message>
+        <source>Untrusted</source>
+        <translation>Untrusted</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation>Unknown</translation>
+    </message>
+    <message>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation>key.share</translation>
+    </message>
+    <message>
+        <source>KeeShare key file</source>
+        <translation>KeeShare key file</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>All files</translation>
+    </message>
+    <message>
+        <source>Select path</source>
+        <translation>Select path</translation>
+    </message>
+    <message>
+        <source>Exporting changed certificate</source>
+        <translation>Exporting changed certificate</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>The exported certificate is not the same as the one in use. Do you want to export the current certificate?</translation>
+    </message>
+    <message>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation>%1.%2</translation>
+    </message>
+</context>
+<context>
+    <name>ShareObserver</name>
+    <message>
+        <source>Import from container without signature</source>
+        <translation>Import from container without signature</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>We cannot verify the source of the shared container because it is not signed. Do you really want to import from %1?</translation>
+    </message>
+    <message>
+        <source>Import from container with certificate</source>
+        <translation>Import from container with certificate</translation>
+    </message>
+    <message>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation>Do you want to trust %1 with the fingerprint of %2 from %3</translation>
+    </message>
+    <message>
+        <source>Not this time</source>
+        <translation>Not this time</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Never</translation>
+    </message>
+    <message>
+        <source>Always</source>
+        <translation>Always</translation>
+    </message>
+    <message>
+        <source>Just this time</source>
+        <translation>Just this time</translation>
+    </message>
+    <message>
+        <source>Import from %1 failed (%2)</source>
+        <translation>Import from %1 failed (%2)</translation>
+    </message>
+    <message>
+        <source>Import from %1 successful (%2)</source>
+        <translation>Import from %1 successful (%2)</translation>
+    </message>
+    <message>
+        <source>Imported from %1</source>
+        <translation>Imported from %1</translation>
+    </message>
+    <message>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation>Signed share container are not supported - import prevented</translation>
+    </message>
+    <message>
+        <source>File is not readable</source>
+        <translation>File is not readable</translation>
+    </message>
+    <message>
+        <source>Invalid sharing container</source>
+        <translation>Invalid sharing container</translation>
+    </message>
+    <message>
+        <source>Untrusted import prevented</source>
+        <translation>Untrusted import prevented</translation>
+    </message>
+    <message>
+        <source>Successful signed import</source>
+        <translation>Successful signed import</translation>
+    </message>
+    <message>
+        <source>Unexpected error</source>
+        <translation>Unexpected error</translation>
+    </message>
+    <message>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation>Unsigned share container are not supported - import prevented</translation>
+    </message>
+    <message>
+        <source>Successful unsigned import</source>
+        <translation>Successful unsigned import</translation>
+    </message>
+    <message>
+        <source>File does not exist</source>
+        <translation>File does not exist</translation>
+    </message>
+    <message>
+        <source>Unknown share container type</source>
+        <translation>Unknown share container type</translation>
+    </message>
+    <message>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation>Overwriting signed share container is not supported - export prevented</translation>
+    </message>
+    <message>
+        <source>Could not write export container (%1)</source>
+        <translation>Could not write export container (%1)</translation>
+    </message>
+    <message>
+        <source>Could not embed signature (%1)</source>
+        <translation>Could not embed signature (%1)</translation>
+    </message>
+    <message>
+        <source>Could not embed database (%1)</source>
+        <translation>Could not embed database (%1)</translation>
+    </message>
+    <message>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation>Overwriting unsigned share container is not supported - export prevented</translation>
+    </message>
+    <message>
+        <source>Could not write export container</source>
+        <translation>Could not write export container</translation>
+    </message>
+    <message>
+        <source>Unexpected export error occurred</source>
+        <translation>Unexpected export error occurred</translation>
+    </message>
+    <message>
+        <source>Export to %1 failed (%2)</source>
+        <translation>Export to %1 failed (%2)</translation>
+    </message>
+    <message>
+        <source>Export to %1 successful (%2)</source>
+        <translation>Export to %1 successful (%2)</translation>
+    </message>
+    <message>
+        <source>Export to %1</source>
+        <translation>Export to %1</translation>
     </message>
 </context>
 <context>
     <name>TotpDialog</name>
     <message>
         <source>Timed Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Timed Password</translation>
     </message>
     <message>
         <source>000000</source>
-        <translation type="unfinished"></translation>
+        <translation>000000</translation>
     </message>
     <message>
         <source>Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Copy</translation>
     </message>
     <message numerus="yes">
         <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation><numerusform>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</numerusform><numerusform>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</numerusform></translation>
     </message>
 </context>
 <context>
     <name>TotpExportSettingsDialog</name>
     <message>
         <source>Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Copy</translation>
     </message>
     <message>
         <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
         <comment>TOTP QR code dialog warning</comment>
-        <translation type="unfinished"></translation>
+        <translation>NOTE: These TOTP settings are custom and may not work with other authenticators.</translation>
     </message>
     <message>
         <source>There was an error creating the QR code.</source>
-        <translation type="unfinished"></translation>
+        <translation>There was an error creating the QR code.</translation>
     </message>
     <message>
         <source>Closing in %1 seconds.</source>
-        <translation type="unfinished"></translation>
+        <translation>Closing in %1 seconds.</translation>
     </message>
 </context>
 <context>
     <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
-        <translation type="unfinished"></translation>
+        <translation>Setup TOTP</translation>
     </message>
     <message>
         <source>Key:</source>
-        <translation type="unfinished"></translation>
+        <translation>Key:</translation>
     </message>
     <message>
         <source>Default RFC 6238 token settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Default RFC 6238 token settings</translation>
     </message>
     <message>
         <source>Steam token settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Steam token settings</translation>
     </message>
     <message>
         <source>Use custom settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Use custom settings</translation>
     </message>
     <message>
         <source>Custom Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Custom Settings</translation>
     </message>
     <message>
         <source>Time step:</source>
-        <translation type="unfinished"></translation>
+        <translation>Time step:</translation>
     </message>
     <message>
         <source> sec</source>
         <comment>Seconds</comment>
-        <translation type="unfinished"></translation>
+        <translation> sec</translation>
     </message>
     <message>
         <source>Code size:</source>
-        <translation type="unfinished"></translation>
+        <translation>Code size:</translation>
     </message>
     <message>
         <source>6 digits</source>
-        <translation type="unfinished"></translation>
+        <translation>6 digits</translation>
     </message>
     <message>
         <source>7 digits</source>
-        <translation type="unfinished"></translation>
+        <translation>7 digits</translation>
     </message>
     <message>
         <source>8 digits</source>
-        <translation type="unfinished"></translation>
+        <translation>8 digits</translation>
+    </message>
+</context>
+<context>
+    <name>UpdateCheckDialog</name>
+    <message>
+        <source>Checking for updates</source>
+        <translation>Checking for updates</translation>
+    </message>
+    <message>
+        <source>Checking for updates...</source>
+        <translation>Checking for updates...</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Close</translation>
+    </message>
+    <message>
+        <source>Update Error!</source>
+        <translation>Update Error!</translation>
+    </message>
+    <message>
+        <source>An error occurred in retrieving update information.</source>
+        <translation>An error occurred in retrieving update information.</translation>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation>Please try again later.</translation>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation>Software Update</translation>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation>A new version of KeePassXC is available!</translation>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation>KeePassXC %1 is now available — you have %2.</translation>
+    </message>
+    <message>
+        <source>Download it at keepassxc.org</source>
+        <translation>Download it at keepassxc.org</translation>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation>You&apos;re up-to-date!</translation>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation>KeePassXC %1 is currently the newest version available</translation>
     </message>
 </context>
 <context>
     <name>WelcomeWidget</name>
     <message>
         <source>Start storing your passwords securely in a KeePassXC database</source>
-        <translation type="unfinished"></translation>
+        <translation>Start storing your passwords securely in a KeePassXC database</translation>
     </message>
     <message>
         <source>Create new database</source>
-        <translation type="unfinished"></translation>
+        <translation>Create new database</translation>
     </message>
     <message>
         <source>Open existing database</source>
-        <translation type="unfinished"></translation>
+        <translation>Open existing database</translation>
     </message>
     <message>
         <source>Import from KeePass 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Import from KeePass 1</translation>
     </message>
     <message>
         <source>Import from CSV</source>
-        <translation type="unfinished"></translation>
+        <translation>Import from CSV</translation>
     </message>
     <message>
         <source>Recent databases</source>
-        <translation type="unfinished"></translation>
+        <translation>Recent databases</translation>
     </message>
     <message>
         <source>Welcome to KeePassXC %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Welcome to KeePassXC %1</translation>
     </message>
 </context>
 <context>
     <name>YubiKeyEditWidget</name>
     <message>
         <source>Refresh</source>
-        <translation type="unfinished"></translation>
+        <translation>Refresh</translation>
     </message>
     <message>
         <source>YubiKey Challenge-Response</source>
-        <translation type="unfinished"></translation>
+        <translation>YubiKey Challenge-Response</translation>
     </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>
+        <translation>&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;</translation>
     </message>
     <message>
         <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
-        <translation type="unfinished"></translation>
+        <translation>No YubiKey detected, please ensure it&apos;s plugged in.</translation>
     </message>
     <message>
         <source>No YubiKey inserted.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>main</name>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>path to a custom config file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>key file of the database</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>read password of the database from stdin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Parent window handle</source>
-        <translation type="unfinished"></translation>
+        <translation>No YubiKey inserted.</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_en_GB.ts b/share/translations/keepassx_en_GB.ts
index 80db1ef30..4e13ce65b 100644
--- a/share/translations/keepassx_en_GB.ts
+++ b/share/translations/keepassx_en_GB.ts
@@ -38,12 +38,6 @@
         <translation>Copy to clipboard</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>Version %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>Revision: %1</translation>
     </message>
@@ -76,35 +70,48 @@ Kernel: %3 %4</translation>
         <translation>Special thanks from the KeePassXC team go to debfx for creating the original KeePassX.</translation>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
-        <translation>Build Type: %1
-</translation>
+        <source>Version %1</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP Confirm Access</translation>
+        <source>Build Type: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>Remember this decision</translation>
+        <source>Auto-Type</source>
+        <translation>Auto-Type</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Allow</translation>
+        <source>Browser Integration</source>
+        <translation>Browser Integration</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>Deny</translation>
+        <source>SSH Agent</source>
+        <translation>SSH Agent</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>%1 has requested access to passwords for the following item(s).
-Please select whether you want to allow access.</translation>
+        <source>YubiKey</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -113,6 +120,277 @@ Please select whether you want to allow access.</translation>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>Enable SSH Agent (requires restart)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Application Settings</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Security</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Access error for config file %1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Basic Settings</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>Startup</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Start only a single instance of KeePassXC</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Remember last databases</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Load previous databases on startup</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>Minimise window at application startup</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>File Management</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation>Safely save database files (may be incompatible with Dropbox, etc)</translation>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Automatically save after every change</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Automatically save on exit</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Automatically reload the database when modified externally</translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Minimise when copying to clipboard</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Show a system tray icon</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>Dark system tray icon</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Hide window to system tray when minimised</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Language</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Auto-Type</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Lock databases when session is locked or lid is closed</translation>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>Lock databases after minimising the window</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>Don&apos;t require password repeat when it is visible</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>Hide entry notes by default</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>Privacy</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -216,6 +494,26 @@ Please select whether you want to allow access.</translation>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancel</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -289,14 +587,6 @@ Please select whether you want to allow access.</translation>
         <translation>Sort matching credentials by &amp;username</translation>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>&amp;Disconnect all browsers</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>Forget all remembered &amp;permissions</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>Advanced</translation>
     </message>
@@ -362,20 +652,37 @@ Please select whether you want to allow access.</translation>
         <translation>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <source>Select custom proxy location</source>
+        <translation>Select custom proxy location</translation>
+    </message>
+    <message>
+        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
+        <translation>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</translation>
+    </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Executable Files (*)</source>
-        <translation>Executable Files (*)</translation>
+        <source>&amp;Tor Browser</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Select custom proxy location</source>
-        <translation>Select custom proxy location</translation>
+        <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: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
-        <translation>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</translation>
+        <source>Executable Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not ask permission for HTTP &amp;Basic Auth</source>
+        <extracomment>An extra HTTP Basic Auth setting</extracomment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -417,149 +724,43 @@ Do you want to overwrite it?</translation>
         <translation>Do you want to update the information in %1 - %2?</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Database locked!</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Settings not available!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation>The active database does not contain a settings entry.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: No keys found</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Removed keys from database</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation><numerusform>Successfully removed %n encryption key from KeePassXC settings.</numerusform><numerusform>Successfully removed %n encryption keys from KeePassXC settings.</numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>Removing stored permissions…</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>Abort</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Removed permissions</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation><numerusform>Successfully removed permissions from %n entry.</numerusform><numerusform>Successfully removed permissions from %n entries.</numerusform></translation>
-    </message>
-    <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: No entry with permissions found!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>The active database does not contain an entry with permissions.</translation>
-    </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>Password</translation>
-    </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>Enter password:</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>Repeat password:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
+        <source>Converting attributes to custom data…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Browse</source>
-        <translation>Browse</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Create</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>Cha&amp;llenge Response</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Refresh</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>Key files</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>All files</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to create Key File : </source>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>Select a key file</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Empty password</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Do you really want to use an empty string as password?</source>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Different passwords supplied.</source>
-        <translation>Different passwords supplied.</translation>
-    </message>
-    <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Legacy key file format</source>
-        <translation>Legacy key file format</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>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>Changing master key failed: no YubiKey inserted.</translation>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -640,66 +841,95 @@ Please consider generating a new key file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty fieldname </source>
+        <source>Imported from CSV file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>column </source>
+        <source>Original data: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Imported from CSV file</source>
-        <translation type="unfinished"/>
+        <source>Error</source>
+        <translation>Error</translation>
     </message>
     <message>
-        <source>Original data: </source>
+        <source>Empty fieldname %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
+        <source>column %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source> more messages skipped]</source>
+        <source>Error(s) detected in CSV file!</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Error</source>
-        <translation>Error</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>CSV import: writer has errors:
-</source>
+%1</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>Error</translation>
-    </message>
-    <message>
-        <source>Unable to calculate master key</source>
-        <translation>Unable to calculate master key</translation>
-    </message>
-</context>
-<context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
+        <source>%n column(s)</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
+        <source>%n byte(s)</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
+        <source>%n row(s)</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Root</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DatabaseOpenWidget</name>
     <message>
         <source>Enter master key</source>
@@ -726,14 +956,6 @@ Please consider generating a new key file.</source>
         <translation>Challenge Response:</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Unable to open the database.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Can&apos;t open key file</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation>Legacy key file format</translation>
     </message>
@@ -760,101 +982,169 @@ Please consider generating a new key file.</source>
         <source>Select key file</source>
         <translation>Select key file</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>Repair database</translation>
+        <source>TouchID for quick unlock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Error</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Can&apos;t open key file</translation>
+        <source>Can't open key file:
+%1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Unable to open the database.</translation>
+        <source>Passwords</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Database opened fine. Nothing to do.</translation>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Security</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>Success</translation>
+        <source>Master Key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
+        <source>Encryption Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>Unable to repair the database.</translation>
+        <source>Browser Integration</source>
+        <translation>Browser Integration</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>General</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>Encryption</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>&amp;Disconnect all browsers</translation>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Number of rounds too high</translation>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation type="unfinished"/>
     </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>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Understood, keep number</source>
-        <translation>Understood, keep number</translation>
+        <source>Stored keys</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>Cancel</translation>
+        <source>Remove</source>
+        <translation>Remove</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Number of rounds too low</translation>
+        <source>Delete the selected key?</source>
+        <translation type="unfinished"/>
     </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>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KDF unchanged</source>
+        <source>Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
-        <translation>Failed to transform key with new KDF parameters; KDF unchanged.</translation>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: No keys found</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Removed keys from database</translation>
     </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Removing stored permissions…</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Abort</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Removed permissions</translation>
+    </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
+        <source>Successfully removed permissions from %n entry(s).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: No entry with permissions found!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>The active database does not contain an entry with permissions.</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetEncryption</name>
@@ -890,6 +1180,109 @@ If you keep this number, your database may be too easy to crack!</source>
         <source>Parallelism:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Number of rounds too high</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"/>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation>Understood, keep number</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancel</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Number of rounds too low</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"/>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation>Failed to transform key with new KDF parameters; KDF unchanged.</translation>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -939,93 +1332,112 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>Root</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 Database</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>All files</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Open database</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>File not found!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Unable to open the database.</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>Open CSV file</translation>
+        <source>Add additional protection...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV file</source>
+        <source>No encryption key added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files (*)</source>
+        <source>You must add at least one encryption key to secure your database!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Merge database</translation>
+        <source>No password set</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Open KeePass 1 database</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 type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1 database</translation>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Close?</source>
+        <source>Failed to change master key</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</translation>
+        <source>Database Name:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>Save changes?</translation>
+        <source>Description:</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>&quot;%1&quot; was modified.
-Save changes?</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 Database</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Writing the database failed.</translation>
+        <source>All files</source>
+        <translation>All files</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation type="unfinished"/>
+        <source>Open database</source>
+        <translation>Open database</translation>
     </message>
     <message>
-        <source>Save database as</source>
+        <source>CSV file</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Merge database</source>
+        <translation>Merge database</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Open KeePass 1 database</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 database</translation>
+    </message>
+    <message>
         <source>Export database to CSV file</source>
         <translation>Export database to CSV file</translation>
     </message>
@@ -1034,38 +1446,40 @@ Save changes?</translation>
         <translation>Writing the CSV file failed.</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>New database</translation>
+        <source>Database creation error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>locked</source>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>Lock database</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>Can&apos;t lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</translation>
+        <source>Select CSV file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
+        <source>New Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disable safe saves?</source>
-        <translation>Disable safe saves?</translation>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
     </message>
     <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 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?</translation>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1075,37 +1489,13 @@ Disable safe saves and try again?</translation>
         <translation>Searching...</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>Change master key</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>Delete entry?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>Do you really want to delete the entry &quot;%1&quot; for good?</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Delete entries?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Do you really want to delete %1 entries for good?</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Move entry to recycle bin?</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation>Do you really want to move entry &quot;%1&quot; to the recycle bin?</translation>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Move entries to recycle bin?</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation><numerusform>Do you really want to move %n entry to the recycle bin?</numerusform><numerusform>Do you really want to move %n entries to the recycle bin?</numerusform></translation>
@@ -1123,18 +1513,10 @@ Disable safe saves and try again?</translation>
         <translation>Remember my choice</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Delete group?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>Do you really want to delete the group &quot;%1&quot; for good?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Unable to calculate master key</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>No current database.</translation>
     </message>
@@ -1169,10 +1551,6 @@ Do you want to merge your changes?</source>
 Do you want to merge your changes?</translation>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>Could not open the new database file while attempting to autoreload this database.</translation>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>Empty recycle bin?</translation>
     </message>
@@ -1180,87 +1558,103 @@ Do you want to merge your changes?</translation>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>Are you sure you want to permanently delete everything from your recycle bin?</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation type="unfinished"/>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Close</translation>
+        <source>File opened in read only mode.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>General</translation>
+        <source>Lock Database?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Password</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot; was modified.
+Save changes?</translation>
     </message>
     <message>
-        <source>Expiration</source>
+        <source>Database was modified.
+Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Username</translation>
+        <source>Save changes?</source>
+        <translation>Save changes?</translation>
     </message>
     <message>
-        <source>Autotype</source>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searching</source>
-        <translation type="unfinished"/>
+        <source>Disable safe saves?</source>
+        <translation>Disable safe saves?</translation>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation type="unfinished"/>
+        <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 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?</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Attachments</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Notes</translation>
+        <source>Passwords</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Window</source>
-        <translation>Window</translation>
+        <source>Save database as</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>Sequence</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 Database</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Search</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Clear</translation>
+        <source>Delete group</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Never</source>
-        <translation>Never</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
+        <source>Successfully merged the database files.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
+        <source>Database was not modified by merge operation.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1335,22 +1729,10 @@ Do you want to merge your changes?</translation>
         <translation>New attribute</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>Are you sure you want to remove this attribute?</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation>Press reveal to view or edit</translation>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation type="unfinished"/>
     </message>
@@ -1363,10 +1745,6 @@ Do you want to merge your changes?</translation>
         <translation><numerusform>%n month</numerusform><numerusform>%n months</numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 year</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation>Apply generated password?</translation>
     </message>
@@ -1378,6 +1756,26 @@ Do you want to merge your changes?</translation>
         <source>Entry updated successfully.</source>
         <translation>Entry updated successfully.</translation>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1623,6 +2021,81 @@ Do you want to merge your changes?</translation>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1680,10 +2153,6 @@ Do you want to merge your changes?</translation>
         <translation>Unable to fetch favicon.</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Images</source>
         <translation>Images</translation>
     </message>
@@ -1692,24 +2161,44 @@ Do you want to merge your changes?</translation>
         <translation>All files</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Select Image</translation>
+        <source>Custom icon already exists</source>
+        <translation>Custom icon already exists</translation>
+    </message>
+    <message>
+        <source>Confirm Delete</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t read icon</source>
-        <translation>Can&apos;t read icon</translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Custom icon already exists</source>
-        <translation>Custom icon already exists</translation>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Confirm Delete</source>
+        <source>Select Image(s)</source>
         <translation type="unfinished"/>
     </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</translation>
+        <source>No icons were loaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1760,8 +2249,7 @@ This may cause the affected plugins to malfunction.</translation>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
+        <source>%1 - Clone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1807,10 +2295,6 @@ This may cause the affected plugins to malfunction.</translation>
         <translation><numerusform>Are you sure you want to remove %n attachment?</numerusform><numerusform>Are you sure you want to remove %n attachments?</numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>Save attachments</translation>
     </message>
@@ -1847,10 +2331,13 @@ This may cause the affected plugins to malfunction.</translation>
 %1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>Unable to open files:
-%1</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1934,109 +2421,167 @@ This may cause the affected plugins to malfunction.</translation>
         <source>Attachments</source>
         <translation>Attachments</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>EntryView</name>
+    <name>EntryPreviewWidget</name>
     <message>
-        <source>Customize View</source>
+        <source>Generate TOTP Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide Usernames</source>
+        <source>Close</source>
+        <translation>Close</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Username</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Password</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide Passwords</source>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fit to window</source>
-        <translation>Fit to window</translation>
+        <source>Attachments</source>
+        <translation>Attachments</translation>
     </message>
     <message>
-        <source>Fit to contents</source>
-        <translation>Fit to contents</translation>
+        <source>Notes</source>
+        <translation>Notes</translation>
     </message>
     <message>
-        <source>Reset to defaults</source>
+        <source>Autotype</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Attachments (icon)</source>
-        <translation type="unfinished"/>
+        <source>Window</source>
+        <translation>Window</translation>
     </message>
-</context>
-<context>
-    <name>Group</name>
     <message>
-        <source>Recycle Bin</source>
-        <translation>Recycle Bin</translation>
+        <source>Sequence</source>
+        <translation>Sequence</translation>
     </message>
-</context>
-<context>
-    <name>HostInstaller</name>
     <message>
-        <source>KeePassXC: Cannot save file!</source>
+        <source>Searching</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot save the native messaging script file.</source>
+        <source>Search</source>
+        <translation>Search</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Clear</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Never</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>HttpPasswordGeneratorWidget</name>
     <message>
-        <source>Length:</source>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Character Types</source>
-        <translation>Character Types</translation>
+        <source>Enabled</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Upper Case Letters</source>
+        <source>Disabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>A-Z</source>
+        <source>Share</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>EntryView</name>
     <message>
-        <source>Lower Case Letters</source>
+        <source>Customize View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>a-z</source>
+        <source>Hide Usernames</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Numbers</source>
+        <source>Hide Passwords</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>0-9</source>
+        <source>Fit to window</source>
+        <translation>Fit to window</translation>
+    </message>
+    <message>
+        <source>Fit to contents</source>
+        <translation>Fit to contents</translation>
+    </message>
+    <message>
+        <source>Reset to defaults</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Special Characters</source>
+        <source>Attachments (icon)</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Group</name>
     <message>
-        <source>/*_&amp; ...</source>
+        <source>Recycle Bin</source>
+        <translation>Recycle Bin</translation>
+    </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>GroupModel</name>
     <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Exclude look-alike characters</translation>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>HostInstaller</name>
     <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>Ensure that the password contains characters from every group</translation>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extended ASCII</source>
-        <translation>Extended ASCII</translation>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2064,6 +2609,26 @@ This may cause the affected plugins to malfunction.</translation>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Wrong key or database file is corrupt.</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>Invalid header field length</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>Invalid header data length</translation>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2223,10 +2788,6 @@ This may cause the affected plugins to malfunction.</translation>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation type="unfinished"/>
     </message>
@@ -2280,6 +2841,18 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Unsupported KeePass 2 database version.</source>
         <translation>Unsupported KeePass 2 database version.</translation>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2352,10 +2925,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation>Unable to decrypt entry string</translation>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation>Duplicate custom attribute found</translation>
     </message>
@@ -2404,6 +2973,12 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2567,29 +3142,127 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Invalid entry field type</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>Existing single-instance lock file is invalid. Launching new instance.</translation>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>The lock file could not be created. Single-instance mode disabled.</translation>
+        <source>Import from</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Another instance of KeePassXC is already running.</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Fatal error while testing the cryptographic functions.</translation>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
+        <source>Key Component</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancel</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>Browse</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Generate</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation>Legacy key file format</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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Key files</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>All files</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Select a key file</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -2602,10 +3275,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Recent databases</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Import</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
@@ -2614,14 +3283,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>E&amp;ntries</translation>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>Copy att&amp;ribute to clipboard</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation>Time-based one-time password</translation>
-    </message>
-    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Groups</translation>
     </message>
@@ -2650,30 +3311,10 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Close database</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>&amp;New database</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>&amp;Add new entry</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>&amp;Delete entry</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>&amp;Add new group</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>&amp;Edit group</translation>
     </message>
@@ -2686,14 +3327,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Sa&amp;ve database as...</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Change &amp;master key...</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>&amp;Database settings</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>Database settings</translation>
     </message>
@@ -2702,10 +3335,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Clone entry</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>&amp;Find</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>Copy &amp;username</translation>
     </message>
@@ -2714,10 +3343,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Copy username to clipboard</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>Cop&amp;y password</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>Copy password to clipboard</translation>
     </message>
@@ -2730,14 +3355,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>&amp;Open URL</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>&amp;Lock databases</translation>
     </message>
@@ -2770,22 +3387,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Export to CSV file...</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Import KeePass 1 database...</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>Import CSV file...</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Re&amp;pair database...</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>Show TOTP</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>Set up TOTP...</translation>
     </message>
@@ -2806,14 +3407,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Access error for config file %1</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Settings</translation>
     </message>
@@ -2826,253 +3419,404 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Quit KeePassXC</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 Database</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Please touch the button on your YubiKey!</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>All files</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Open database</translation>
+        <source>&amp;Donate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Save repaired database</translation>
+        <source>Report a &amp;bug</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Writing the database failed.</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Please touch the button on your YubiKey!</translation>
+        <source>&amp;Import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
+        <source>Copy att&amp;ribute...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>OpenSSHKey</name>
+    <name>Merger</name>
     <message>
-        <source>Invalid key file, expecting an OpenSSH key</source>
+        <source>Creating missing %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>PEM boundary mismatch</source>
+        <source>Relocating %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Base64 decoding failed</source>
+        <source>Overwriting %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key file way too small.</source>
+        <source>older entry merged from database &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key file magic header id invalid</source>
+        <source>Adding backup for older target %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Found zero keys</source>
+        <source>Adding backup for older source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to read public key.</source>
-        <translation>Failed to read public key.</translation>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Corrupted key file, reading private key failed</source>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>No private key payload to decrypt</source>
+        <source>Synchronizing from newer source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Trying to run KDF without cipher</source>
+        <source>Synchronizing from older source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase is required to decrypt this key</source>
-        <translation>Passphrase is required to decrypt this key</translation>
+        <source>Deleting child %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key derivation failed, key file corrupted?</source>
+        <source>Deleting orphan %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Decryption failed, wrong passphrase?</source>
+        <source>Changed deleted objects</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unexpected EOF while reading public key</source>
-        <translation>Unexpected EOF while reading public key</translation>
+        <source>Adding missing icon %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
     <message>
-        <source>Unexpected EOF while reading private key</source>
-        <translation>Unexpected EOF while reading private key</translation>
+        <source>Create a new KeePassXC database...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t write public key as it is empty</source>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Root</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unexpected EOF when writing public key</source>
-        <translation>Unexpected EOF when writing public key</translation>
+        <source>En&amp;cryption Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t write private key as it is empty</source>
+        <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"/>
     </message>
     <message>
-        <source>Unexpected EOF when writing private key</source>
-        <translation>Unexpected EOF when writing private key</translation>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported key type: %1</source>
-        <translation>Unsupported key type: %1</translation>
+        <source>Simple Settings</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
     <message>
-        <source>Unknown cipher: %1</source>
-        <translation>Unknown cipher: %1</translation>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cipher IV is too short for MD5 kdf</source>
+        <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"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
     <message>
-        <source>Unknown KDF: %1</source>
+        <source>Database Master Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unknown key type: %1</source>
-        <translation>Unknown key type: %1</translation>
+        <source>A master key known only to you protects your database.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>NewDatabaseWizardPageMetaData</name>
     <message>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
+        <source>General Database Information</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>This is required for accessing your databases from ChromeIPass or PassIFox</translation>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>Enable KeePassHTTP server</translation>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>General</translation>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>Sh&amp;ow a notification when credentials are requested</translation>
+        <source>Base64 decoding failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>Only returns the best matches for a specific URL instead of all entries for the whole domain.</translation>
+        <source>Key file way too small.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return only best matching entries</source>
-        <translation>&amp;Return only best matching entries</translation>
+        <source>Key file magic header id invalid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Re&amp;quest to unlock the database if it is locked</translation>
+        <source>Found zero keys</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation type="unfinished"/>
+        <source>Failed to read public key.</source>
+        <translation>Failed to read public key.</translation>
     </message>
     <message>
-        <source>&amp;Match URL schemes</source>
-        <translation>&amp;Match URL schemes</translation>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Sort matching entries by &amp;username</translation>
+        <source>No private key payload to decrypt</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Sort &amp;matching entries by title</translation>
+        <source>Trying to run KDF without cipher</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>R&amp;emove all shared encryption keys from active database</translation>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation>Passphrase is required to decrypt this key</translation>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>Re&amp;move all stored permissions from entries in active database</translation>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password Generator</source>
+        <source>Decryption failed, wrong passphrase?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Advanced</translation>
+        <source>Unexpected EOF while reading public key</source>
+        <translation>Unexpected EOF while reading public key</translation>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Always allow &amp;access to entries</translation>
+        <source>Unexpected EOF while reading private key</source>
+        <translation>Unexpected EOF while reading private key</translation>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
+        <source>Can&apos;t write public key as it is empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>Only the selected database has to be connected with a client.</translation>
+        <source>Unexpected EOF when writing public key</source>
+        <translation>Unexpected EOF when writing public key</translation>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Searc&amp;h in all opened databases for matching entries</translation>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>Automatically creating or updating string fields is not supported.</translation>
+        <source>Unexpected EOF when writing private key</source>
+        <translation>Unexpected EOF when writing private key</translation>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>&amp;Return advanced string fields which start with &quot;KPH: &quot;</translation>
+        <source>Unsupported key type: %1</source>
+        <translation>Unsupported key type: %1</translation>
+    </message>
+    <message>
+        <source>Unknown cipher: %1</source>
+        <translation>Unknown cipher: %1</translation>
     </message>
     <message>
-        <source>HTTP Port:</source>
+        <source>Cipher IV is too short for MD5 kdf</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown KDF: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Default port: 19455</translation>
+        <source>Unknown key type: %1</source>
+        <translation>Unknown key type: %1</translation>
     </message>
+</context>
+<context>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <source>Enter password:</source>
+        <translation>Enter password:</translation>
+    </message>
+    <message>
+        <source>Confirm password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</translation>
+        <source>Password</source>
+        <translation>Password</translation>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <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"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
+        <source>Password cannot be empty.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
+        <source>Passwords do not match.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate master password</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -3144,18 +3888,10 @@ Using default port 19455.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>Generate</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Copy</translation>
     </message>
@@ -3168,10 +3904,6 @@ Using default port 19455.</source>
         <translation>Close</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>Apply</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation type="unfinished"/>
     </message>
@@ -3199,6 +3931,171 @@ Using default port 19455.</source>
         <comment>Password quality</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Advanced</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Delete</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Remove</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Disable</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3219,34 +4116,18 @@ Using default port 19455.</source>
         <translation>Cannot decrypt message</translation>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Action cancelled or denied</source>
         <translation>Action cancelled or denied</translation>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>KeePassXC association failed, try again</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key change was not successful</source>
-        <translation>Key change was not successful</translation>
-    </message>
-    <message>
         <source>Encryption key is not recognized</source>
         <translation>Encryption key is not recognised</translation>
     </message>
     <message>
-        <source>No saved databases found</source>
-        <translation>No saved databases found</translation>
-    </message>
-    <message>
         <source>Incorrect action</source>
         <translation type="unfinished"/>
     </message>
@@ -3372,10 +4253,6 @@ Using default port 19455.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3454,16 +4331,376 @@ Available commands:
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>file empty !
-</source>
+        <source>malformed string</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>malformed string</source>
+        <source>missing closing quote</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>missing closing quote</source>
+        <source>Group</source>
+        <translation>Group</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Title</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Username</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Password</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notes</translation>
+    </message>
+    <message>
+        <source>Last Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation>Browser Integration</translation>
+    </message>
+    <message>
+        <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Press</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation>SSH Agent</translation>
+    </message>
+    <message>
+        <source>Generate a new random diceware passphrase.</source>
+        <translation>Generate a new random diceware passphrase.</translation>
+    </message>
+    <message>
+        <source>Word count for the diceware passphrase.</source>
+        <translation>Word count for the diceware passphrase.</translation>
+    </message>
+    <message>
+        <source>Wordlist for the diceware generator.
+[Default: EFF English]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new random password.</source>
+        <translation>Generate a new random password.</translation>
+    </message>
+    <message>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -3491,101 +4728,114 @@ Available commands:
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Group</source>
-        <translation>Group</translation>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Title</source>
-        <translation>Title</translation>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Username</translation>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Password</translation>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Notes</translation>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Last Modified</source>
+        <source>File %1 already exists.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Created</source>
+        <source>Loading the key file failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
-        <translation>Legacy Browser Integration</translation>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Browser Integration</source>
-        <translation>Browser Integration</translation>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
+        <source>Successfully created new database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Press</source>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passive</source>
+        <source>Creating KeyFile %1 failed: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>SSH Agent</source>
-        <translation>SSH Agent</translation>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Generate a new random diceware passphrase.</source>
-        <translation>Generate a new random diceware passphrase.</translation>
+        <source>Remove an entry from the database.</source>
+        <translation>Remove an entry from the database.</translation>
     </message>
     <message>
-        <source>Word count for the diceware passphrase.</source>
-        <translation>Word count for the diceware passphrase.</translation>
+        <source>Path of the entry to remove.</source>
+        <translation>Path of the entry to remove.</translation>
     </message>
     <message>
-        <source>count</source>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>Existing single-instance lock file is invalid. Launching new instance.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>The lock file could not be created. Single-instance mode disabled.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist for the diceware generator.
-[Default: EFF English]</source>
+        <source>filenames of the password databases to open (*.kdbx)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Generate a new random password.</source>
-        <translation>Generate a new random password.</translation>
+        <source>path to a custom config file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Length of the generated password.</source>
-        <translation>Length of the generated password.</translation>
+        <source>key file of the database</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
-        <translation>Use lowercase characters in the generated password.</translation>
+        <source>read password of the database from stdin</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
-        <translation>Use uppercase characters in the generated password.</translation>
+        <source>Parent window handle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Another instance of KeePassXC is already running.</translation>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
-        <translation>Use numbers in the generated password.</translation>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Fatal error while testing the cryptographic functions.</translation>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
-        <translation>Use special characters in the generated password.</translation>
+        <source>KeePassXC - Error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
-        <translation>Use extended ASCII in the generated password.</translation>
+        <source>Database password: </source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3623,11 +4873,97 @@ Available commands:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
+    <message>
+        <source>Agent connection failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <source>Search...</source>
-        <translation>Search...</translation>
+        <source>Examples</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SearchWidget</name>
     <message>
         <source>Search</source>
         <translation>Search</translation>
@@ -3637,312 +4973,316 @@ Available commands:
         <translation>Clear</translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
+        <source>Limit search to selected group</source>
+        <translation>Limit search to selected group</translation>
+    </message>
+    <message>
+        <source>Search Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Limit search to selected group</source>
-        <translation>Limit search to selected group</translation>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>Service</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC: New key association request</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
+        <source>Allow export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: Overwrite existing key?</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: Update Entry</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Do you want to update the information in %1 - %2?</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Database locked!</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</translation>
+        <source>Key:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Removed keys from database</translation>
+        <source>Generate</source>
+        <translation>Generate</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    <message>
+        <source>Import</source>
+        <translation>Import</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: No keys found</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <source>Imported certificates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Settings not available!</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <source>Ask</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>Removing stored permissions...</translation>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>Abort</translation>
+        <source>Remove</source>
+        <translation>Remove</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Removed permissions</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation><numerusform>Successfully removed permissions from %n entry.</numerusform><numerusform>Successfully removed permissions from %n entries.</numerusform></translation>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: No entry with permissions found!</translation>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>The active database does not contain an entry with permissions.</translation>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
-        <translation>Application Settings</translation>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>General</translation>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>Security</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>Access error for config file %1</translation>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>Basic Settings</translation>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Start only a single instance of KeePassXC</translation>
+        <source>All files</source>
+        <translation>All files</translation>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>Remember last databases</translation>
+        <source>Select path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
+        <source>Exporting changed certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Load previous databases on startup</translation>
+        <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"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>Automatically save on exit</translation>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>Automatically save after every change</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Automatically reload the database when modified externally</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>Minimise when copying to clipboard</translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Minimise window at application startup</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
+        <source>Not this time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</translation>
+        <source>Never</source>
+        <translation>Never</translation>
     </message>
     <message>
-        <source>Hide the Details view</source>
+        <source>Always</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>Show a system tray icon</translation>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>Hide window to system tray when minimised</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
+        <source>Import from %1 successful (%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
-        <translation>Dark system tray icon</translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Language</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Auto-Type</translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
+        <source>Invalid sharing container</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
+        <source>Untrusted import prevented</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
+        <source>Successful signed import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
+        <source>Unexpected error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
+        <source>Unsigned share container are not supported - import prevented</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
+        <source>Successful unsigned import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
-        <translation>Startup</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
-        <translation>File Management</translation>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation>Safely save database files (may be incompatible with Dropbox, etc)</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
+        <source>Could not write export container (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
+        <source>Could not embed signature (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>General</translation>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
+        <source>Could not write export container</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
+        <source>Unexpected export error occurred</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
+        <source>Export to %1 failed (%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
+        <source>Export to %1 successful (%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Lock databases when session is locked or lid is closed</translation>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>TotpDialog</name>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>Lock databases after minimising the window</translation>
+        <source>Timed Password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>Don&apos;t require password repeat when it is visible</translation>
+        <source>000000</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Show passwords in cleartext by default</translation>
+        <source>Copy</source>
+        <translation>Copy</translation>
     </message>
-    <message>
-        <source>Hide passwords in the preview panel</source>
-        <translation>Hide passwords in the preview panel</translation>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
     <message>
-        <source>Hide entry notes by default</source>
-        <translation>Hide entry notes by default</translation>
+        <source>Copy</source>
+        <translation>Copy</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>Privacy</translation>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>Use Google as fallback for downloading website icons</translation>
+        <source>There was an error creating the QR code.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <source>Closing in %1 seconds.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation type="unfinished"/>
@@ -3964,7 +5304,7 @@ Please unlock the selected database or choose another one which is unlocked.</tr
         <translation>Use custom settings</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
+        <source>Custom Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -3972,7 +5312,12 @@ Please unlock the selected database or choose another one which is unlocked.</tr
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>8 digits</source>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Code size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -3980,43 +5325,63 @@ Please unlock the selected database or choose another one which is unlocked.</tr
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Code size:</source>
+        <source>7 digits</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
+        <source>8 digits</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
+        <source>Checking for updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
+        <source>Checking for updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Copy</translation>
+        <source>Close</source>
+        <translation>Close</translation>
     </message>
     <message>
-        <source>Expires in</source>
+        <source>Update Error!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>Unlock database</translation>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4051,41 +5416,25 @@ Please unlock the selected database or choose another one which is unlocked.</tr
     </message>
 </context>
 <context>
-    <name>main</name>
-    <message>
-        <source>Remove an entry from the database.</source>
-        <translation>Remove an entry from the database.</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>Path of the database.</translation>
-    </message>
-    <message>
-        <source>Path of the entry to remove.</source>
-        <translation>Path of the entry to remove.</translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation type="unfinished"/>
+        <source>Refresh</source>
+        <translation>Refresh</translation>
     </message>
     <message>
-        <source>path to a custom config file</source>
+        <source>YubiKey Challenge-Response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>key file of the database</source>
+        <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"/>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Parent window handle</source>
+        <source>No YubiKey inserted.</source>
         <translation type="unfinished"/>
     </message>
 </context>
diff --git a/share/translations/keepassx_en_US.ts b/share/translations/keepassx_en_US.ts
index f964e8a99..2cfb15456 100644
--- a/share/translations/keepassx_en_US.ts
+++ b/share/translations/keepassx_en_US.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="en_US" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="en" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -38,12 +38,6 @@
         <translation>Copy to clipboard</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>Version %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>Revision: %1</translation>
     </message>
@@ -76,35 +70,48 @@ Kernel: %3 %4</translation>
         <translation>Special thanks from the KeePassXC team go to debfx for creating the original KeePassX.</translation>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
-        <translation>Build Type: %1
-</translation>
+        <source>Version %1</source>
+        <translation>Version %1</translation>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP Confirm Access</translation>
+        <source>Build Type: %1</source>
+        <translation>Build Type: %1</translation>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>Remember this decision</translation>
+        <source>Auto-Type</source>
+        <translation>Auto-Type</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Allow</translation>
+        <source>Browser Integration</source>
+        <translation>Browser Integration</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>Deny</translation>
+        <source>SSH Agent</source>
+        <translation>SSH Agent</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>%1 has requested access to passwords for the following item(s).
-Please select whether you want to allow access.</translation>
+        <source>YubiKey</source>
+        <translation>YubiKey</translation>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation>TouchID</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>None</translation>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation>KeeShare (signed and unsigned sharing)</translation>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation>KeeShare (only signed sharing)</translation>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation>KeeShare (only unsigned sharing)</translation>
     </message>
 </context>
 <context>
@@ -113,6 +120,277 @@ Please select whether you want to allow access.</translation>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>Enable SSH Agent (requires restart)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation>Use OpenSSH for Windows instead of Pageant</translation>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Application Settings</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Security</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Access error for config file %1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation>Icon only</translation>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation>Text only</translation>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation>Text beside icon</translation>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation>Text under icon</translation>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation>Follow style</translation>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Basic Settings</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>Startup</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Start only a single instance of KeePassXC</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Remember last databases</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Remember last key files and security dongles</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Load previous databases on startup</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>Minimize window at application startup</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>File Management</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation>Safely save database files (may be incompatible with Dropbox, etc)</translation>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation>Backup database file before saving</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Automatically save after every change</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Automatically save on exit</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Automatically reload the database when modified externally</translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>Entry Management</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>Use group icon on entry creation</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Minimize when copying to clipboard</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation>Hide the entry preview panel</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation>Hide toolbar (icons)</translation>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation>Minimize instead of app exit</translation>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Show a system tray icon</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>Dark system tray icon</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Hide window to system tray when minimized</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Language</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Auto-Type</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>Use entry title to match windows for global Auto-Type</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>Use entry URL to match windows for global Auto-Type</translation>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>Always ask before performing Auto-Type</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Global Auto-Type shortcut</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation>Auto-Type typing delay</translation>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation> ms</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation>Auto-Type start delay</translation>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation>Check for updates at application startup</translation>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation>Include pre-releases when checking for updates</translation>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation>Movable toolbar</translation>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation>Button style</translation>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>Timeouts</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>Clear clipboard after</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> sec</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>Lock databases after inactivity of</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation> min</translation>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation>Forget TouchID after inactivity of</translation>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>Convenience</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Lock databases when session is locked or lid is closed</translation>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation>Forget TouchID when session is locked or lid is closed</translation>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>Lock databases after minimizing the window</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation>Re-lock previously locked database after performing Auto-Type</translation>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>Don&apos;t require password repeat when it is visible</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation>Don&apos;t hide passwords when editing them</translation>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation>Don&apos;t use placeholder for empty password fields</translation>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation>Hide passwords in the entry preview panel</translation>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>Hide entry notes by default</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>Privacy</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation>Use DuckDuckGo as fallback for downloading website icons</translation>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -216,6 +494,27 @@ Please select whether you want to allow access.</translation>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation>KeePassXC-Browser Save Entry</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancel</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation>You have multiple databases open.
+Please select the correct database for saving credentials.</translation>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -227,7 +526,7 @@ Please select whether you want to allow access.</translation>
     </message>
     <message>
         <source>Enable KeepassXC browser integration</source>
-        <translation>Enable KeePassXC browser integration</translation>
+        <translation>Enable KeepassXC browser integration</translation>
     </message>
     <message>
         <source>General</source>
@@ -289,14 +588,6 @@ Please select whether you want to allow access.</translation>
         <translation>Sort matching credentials by &amp;username</translation>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>&amp;Disconnect all browsers</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>Forget all remembered &amp;permissions</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>Advanced</translation>
     </message>
@@ -362,14 +653,6 @@ Please select whether you want to allow access.</translation>
         <translation>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>Executable Files (*.exe);;All Files (*.*)</translation>
-    </message>
-    <message>
-        <source>Executable Files (*)</source>
-        <translation>Executable Files (*)</translation>
-    </message>
-    <message>
         <source>Select custom proxy location</source>
         <translation>Select custom proxy location</translation>
     </message>
@@ -377,6 +660,31 @@ Please select whether you want to allow access.</translation>
         <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
         <translation>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</translation>
     </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</translation>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation>&amp;Tor Browser</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: </source>
+        <translation>&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: </translation>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation>Executable Files</translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation>All Files</translation>
+    </message>
+    <message>
+        <source>Do not ask permission for HTTP &amp;Basic Auth</source>
+        <extracomment>An extra HTTP Basic Auth setting</extracomment>
+        <translation>Do not ask permission for HTTP &amp;Basic Auth</translation>
+    </message>
 </context>
 <context>
     <name>BrowserService</name>
@@ -417,153 +725,46 @@ Do you want to overwrite it?</translation>
         <translation>Do you want to update the information in %1 - %2?</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Database locked!</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Settings not available!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation>The active database does not contain a settings entry.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: No keys found</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation>No shared encryption keys found in KeePassXC Settings.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Removed keys from database</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation><numerusform>Successfully removed %n encryption key from KeePassXC settings.</numerusform><numerusform>Successfully removed %n encryption keys from KeePassXC settings.</numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>Removing stored permissions…</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>Abort</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Removed permissions</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation><numerusform>Successfully removed permissions from %n entry.</numerusform><numerusform>Successfully removed permissions from %n entries.</numerusform></translation>
+        <source>Converting attributes to custom data…</source>
+        <translation>Converting attributes to custom data…</translation>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: No entry with permissions found!</translation>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation>KeePassXC: Converted KeePassHTTP attributes</translation>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>The active database does not contain an entry with permissions.</translation>
-    </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>Password</translation>
-    </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>Enter password:</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>Repeat password:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;Key file</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>Browse</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Create</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>Cha&amp;llenge Response</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Refresh</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>Key files</translation>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</translation>
     </message>
-    <message>
-        <source>All files</source>
-        <translation>All files</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>Create Key File...</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>Unable to create Key File : </translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>Select a key file</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Empty password</translation>
-    </message>
-    <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>Do you really want to use an empty string as password?</translation>
-    </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>Different passwords supplied.</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation><numerusform>Successfully moved %n keys to custom data.</numerusform><numerusform>Successfully moved %n keys to custom data.</numerusform></translation>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>Failed to set %1 as the Key file:
-%2</translation>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation>KeePassXC: No entry with KeePassHTTP attributes found!</translation>
     </message>
     <message>
-        <source>Legacy key file format</source>
-        <translation>Legacy key file format</translation>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation>The active database does not contain an entry with KeePassHTTP attributes.</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>You are using a legacy key file format which may become
-unsupported in the future.
-
-Please consider generating a new key file.</translation>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation>KeePassXC: Legacy browser integration settings detected</translation>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>Changing master key failed: no YubiKey inserted.</translation>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</translation>
     </message>
 </context>
 <context>
@@ -644,14 +845,6 @@ Please consider generating a new key file.</translation>
         <translation>Not present in CSV file</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>Empty fieldname </translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>column </translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>Imported from CSV file</translation>
     </message>
@@ -660,48 +853,85 @@ Please consider generating a new key file.</translation>
         <translation>Original data: </translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>Error(s) detected in CSV file !</translation>
+        <source>Error</source>
+        <translation>Error</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation> more messages skipped]</translation>
+        <source>Empty fieldname %1</source>
+        <translation>Empty fieldname %1</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Error</translation>
+        <source>column %1</source>
+        <translation>column %1</translation>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>CSV import: writer has errors:
-</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation>Error(s) detected in CSV file!</translation>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>Error</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation><numerusform>[%n more message(s) skipped]</numerusform><numerusform>[%n more message(s) skipped]</numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Unable to calculate master key</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation>CSV import: writer has errors:
+%1</translation>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
-        <translation><numerusform>%n byte, </numerusform><numerusform>%n bytes, </numerusform></translation>
+        <source>%n column(s)</source>
+        <translation><numerusform>%n column(s)</numerusform><numerusform>%n column(s)</numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation>%1, %2, %3</translation>
     </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
-        <translation><numerusform>%n row, </numerusform><numerusform>%n rows, </numerusform></translation>
+        <source>%n byte(s)</source>
+        <translation><numerusform>%n byte(s)</numerusform><numerusform>%n byte(s)</numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
-        <translation><numerusform>%n column</numerusform><numerusform>%n columns</numerusform></translation>
+        <source>%n row(s)</source>
+        <translation><numerusform>%n row(s)</numerusform><numerusform>%n row(s)</numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Root</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>File %1 does not exist.</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Unable to open file %1.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation>Error while reading the database: %1</translation>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation>Could not save, database has no file name.</translation>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation>File cannot be written as it is opened in read-only mode.</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation>Unlock Database - KeePassXC</translation>
     </message>
 </context>
 <context>
@@ -731,14 +961,6 @@ Please consider generating a new key file.</translation>
         <translation>Challenge Response:</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Unable to open the database.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Can&apos;t open key file</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation>Legacy key file format</translation>
     </message>
@@ -768,105 +990,174 @@ Please consider generating a new key file.</translation>
         <source>Select key file</source>
         <translation>Select key file</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>Repair database</translation>
+        <source>TouchID for quick unlock</source>
+        <translation>TouchID for quick unlock</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Error</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation>Unable to open the database:
+%1</translation>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Can&apos;t open key file</translation>
+        <source>Can't open key file:
+%1</source>
+        <translation>Can&apos;t open key file:
+%1</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Unable to open the database.</translation>
+        <source>Passwords</source>
+        <translation>Passwords</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Advanced Settings</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>General</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Database opened fine. Nothing to do.</translation>
+        <source>Security</source>
+        <translation>Security</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>Success</translation>
+        <source>Master Key</source>
+        <translation>Master Key</translation>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>The database has been successfully repaired
-You can now save it.</translation>
+        <source>Encryption Settings</source>
+        <translation>Encryption Settings</translation>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>Unable to repair the database.</translation>
+        <source>Browser Integration</source>
+        <translation>Browser Integration</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>General</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation>KeePassXC-Browser settings</translation>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>Encryption</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>&amp;Disconnect all browsers</translation>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Number of rounds too high</translation>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation>Forg&amp;et all site-specific settings on entries</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>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!</translation>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</translation>
     </message>
     <message>
-        <source>Understood, keep number</source>
-        <translation>Understood, keep number</translation>
+        <source>Stored keys</source>
+        <translation>Stored keys</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>Cancel</translation>
+        <source>Remove</source>
+        <translation>Remove</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Number of rounds too low</translation>
+        <source>Delete the selected key?</source>
+        <translation>Delete the selected key?</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>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!</translation>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</translation>
     </message>
     <message>
-        <source>KDF unchanged</source>
-        <translation>KDF unchanged</translation>
+        <source>Key</source>
+        <translation>Key</translation>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
-        <translation>Failed to transform key with new KDF parameters; KDF unchanged.</translation>
+        <source>Value</source>
+        <translation>Value</translation>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation>Enable Browser Integration to access these settings.</translation>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation>Disconnect all browsers</translation>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: No keys found</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation>No shared encryption keys found in KeePassXC settings.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Removed keys from database</translation>
     </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
-        <translation><numerusform> MiB</numerusform><numerusform> MiB</numerusform></translation>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation><numerusform>Successfully removed %n encryption key(s) from KeePassXC settings.</numerusform><numerusform>Successfully removed %n encryption key(s) from KeePassXC settings.</numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation>Forget all site-specific settings on entries</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>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Removing stored permissions…</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Abort</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Removed permissions</translation>
     </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
-        <translation><numerusform> thread</numerusform><numerusform> threads</numerusform></translation>
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation><numerusform>Successfully removed permissions from %n entry(s).</numerusform><numerusform>Successfully removed permissions from %n entry(s).</numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: No entry with permissions found!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>The active database does not contain an entry with permissions.</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation>Move KeePassHTTP attributes to custom data</translation>
+    </message>
+    <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>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.</translation>
     </message>
 </context>
 <context>
@@ -903,6 +1194,113 @@ If you keep this number, your database may be too easy to crack!</translation>
         <source>Parallelism:</source>
         <translation>Parallelism:</translation>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation>Decryption Time:</translation>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation>?? s</translation>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation>Change</translation>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation>100 ms</translation>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation>5 s</translation>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation>Higher values offer more protection, but opening the database will take longer.</translation>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation>Database format:</translation>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation>This is only important if you need to use your database with other programs.</translation>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation>KDBX 4.0 (recommended)</translation>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation>KDBX 3.1</translation>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation>unchanged</translation>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Number of rounds too high</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>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!</translation>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation>Understood, keep number</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancel</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Number of rounds too low</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>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!</translation>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation>KDF unchanged</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation>Failed to transform key with new KDF parameters; KDF unchanged.</translation>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation><numerusform> MiB</numerusform><numerusform> MiB</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation><numerusform> thread(s)</numerusform><numerusform> thread(s)</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation><numerusform>%1 ms</numerusform><numerusform>%1 ms</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -952,91 +1350,112 @@ If you keep this number, your database may be too easy to crack!</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>Root</translation>
+        <source>Sharing</source>
+        <translation>Sharing</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 Database</translation>
+        <source>Breadcrumb</source>
+        <translation>Breadcrumb</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>All files</translation>
+        <source>Type</source>
+        <translation>Type</translation>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Open database</translation>
+        <source>Path</source>
+        <translation>Path</translation>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>File not found!</translation>
+        <source>Last Signer</source>
+        <translation>Last Signer</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Unable to open the database.</translation>
+        <source>Certificates</source>
+        <translation>Certificates</translation>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>File opened in read only mode.</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation> &gt; </translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>Open CSV file</translation>
+        <source>Add additional protection...</source>
+        <translation>Add additional protection...</translation>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>CSV file</translation>
+        <source>No encryption key added</source>
+        <translation>No encryption key added</translation>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>All files (*)</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation>You must add at least one encryption key to secure your database!</translation>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Merge database</translation>
+        <source>No password set</source>
+        <translation>No password set</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Open KeePass 1 database</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>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?</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1 database</translation>
+        <source>Unknown error</source>
+        <translation>Unknown error</translation>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>Close?</translation>
+        <source>Failed to change master key</source>
+        <translation>Failed to change master key</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</translation>
+        <source>Database Name:</source>
+        <translation>Database Name:</translation>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>Save changes?</translation>
+        <source>Description:</source>
+        <translation>Description:</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>&quot;%1&quot; was modified.
-Save changes?</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 Database</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Writing the database failed.</translation>
+        <source>All files</source>
+        <translation>All files</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Passwords</translation>
+        <source>Open database</source>
+        <translation>Open database</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Save database as</translation>
+        <source>CSV file</source>
+        <translation>CSV file</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>Merge database</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Open KeePass 1 database</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 database</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1047,40 +1466,41 @@ Save changes?</translation>
         <translation>Writing the CSV file failed.</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>New database</translation>
+        <source>Database creation error</source>
+        <translation>Database creation error</translation>
     </message>
     <message>
-        <source>locked</source>
-        <translation>locked</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>The created database has no key or KDF, refusing to save it.
+This is definitely a bug, please report it to the developers.</translation>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>Lock database</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation>The database file does not exist or is not accessible.</translation>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>Can&apos;t lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</translation>
+        <source>Select CSV file</source>
+        <translation>Select CSV file</translation>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</translation>
+        <source>New Database</source>
+        <translation>New Database</translation>
     </message>
     <message>
-        <source>Disable safe saves?</source>
-        <translation>Disable safe saves?</translation>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [New Database]</translation>
     </message>
     <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 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?</translation>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Locked]</translation>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Read-only]</translation>
     </message>
 </context>
 <context>
@@ -1090,40 +1510,16 @@ Disable safe saves and try again?</translation>
         <translation>Searching...</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>Change master key</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>Delete entry?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>Do you really want to delete the entry &quot;%1&quot; for good?</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Delete entries?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Do you really want to delete %1 entries for good?</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Move entry to recycle bin?</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation>Do you really want to move entry &quot;%1&quot; to the recycle bin?</translation>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Move entries to recycle bin?</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation><numerusform>Do you really want to move %n entry to the recycle bin?</numerusform><numerusform>Do you really want to move %n entries to the recycle bin?</numerusform></translation>
+        <translation><numerusform>Do you really want to move %n entry(s) to the recycle bin?</numerusform><numerusform>Do you really want to move %n entry(s) to the recycle bin?</numerusform></translation>
     </message>
     <message>
         <source>Execute command?</source>
@@ -1138,18 +1534,10 @@ Disable safe saves and try again?</translation>
         <translation>Remember my choice</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Delete group?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>Do you really want to delete the group &quot;%1&quot; for good?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Unable to calculate master key</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>No current database.</translation>
     </message>
@@ -1184,10 +1572,6 @@ Do you want to merge your changes?</source>
 Do you want to merge your changes?</translation>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>Could not open the new database file while attempting to autoreload this database.</translation>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>Empty recycle bin?</translation>
     </message>
@@ -1195,88 +1579,107 @@ Do you want to merge your changes?</translation>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>Are you sure you want to permanently delete everything from your recycle bin?</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>Generate TOTP Token</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation><numerusform>Do you really want to delete %n entry(s) for good?</numerusform><numerusform>Do you really want to delete %n entry(s) for good?</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation><numerusform>Delete entry(s)?</numerusform><numerusform>Delete entry(s)?</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation><numerusform>Move entry(s) to recycle bin?</numerusform><numerusform>Move entry(s) to recycle bin?</numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Close</translation>
+        <source>File opened in read only mode.</source>
+        <translation>File opened in read only mode.</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>General</translation>
+        <source>Lock Database?</source>
+        <translation>Lock Database?</translation>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Password</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation>You are editing an entry. Discard changes and lock anyway?</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot; was modified.
+Save changes?</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>Expiration</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation>Database was modified.
+Save changes?</translation>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Username</translation>
+        <source>Save changes?</source>
+        <translation>Save changes?</translation>
     </message>
     <message>
-        <source>Autotype</source>
-        <translation>Auto-Type</translation>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation>Could not open the new database file while attempting to autoreload.
+Error: %1</translation>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>Searching</translation>
+        <source>Disable safe saves?</source>
+        <translation>Disable safe saves?</translation>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>Attributes</translation>
+        <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 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?</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Attachments</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation>Writing the database failed.
+%1</translation>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Notes</translation>
+        <source>Passwords</source>
+        <translation>Passwords</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>Window</translation>
+        <source>Save database as</source>
+        <translation>Save database as</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>Sequence</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 Database</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Search</translation>
+        <source>Replace references to entry?</source>
+        <translation>Replace references to entry?</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>Entry &quot;%1&quot; has %2 reference(s). Do you want to overwrite references with values, skip this entry, or delete anyway?</numerusform><numerusform>Entry &quot;%1&quot; has %2 reference(s). Do you want to overwrite references with values, skip this entry, or delete anyway?</numerusform></translation>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Clear</translation>
+        <source>Delete group</source>
+        <translation>Delete group</translation>
     </message>
     <message>
-        <source>Never</source>
-        <translation>Never</translation>
+        <source>Move group to recycle bin?</source>
+        <translation>Move group to recycle bin?</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[PROTECTED]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation>Do you really want to move the group &quot;%1&quot; to the recycle bin?</translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>Disabled</translation>
+        <source>Successfully merged the database files.</source>
+        <translation>Successfully merged the database files.</translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Enabled</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation>Database was not modified by merge operation.</translation>
     </message>
 </context>
 <context>
@@ -1350,36 +1753,20 @@ Do you want to merge your changes?</translation>
         <translation>New attribute</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Confirm Remove</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>Are you sure you want to remove this attribute?</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[PROTECTED]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation>Press reveal to view or edit</translation>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>Tomorrow</translation>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n week</numerusform><numerusform>%n weeks</numerusform></translation>
+        <translation><numerusform>%n week(s)</numerusform><numerusform>%n week(s)</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation><numerusform>%n month</numerusform><numerusform>%n months</numerusform></translation>
-    </message>
-    <message>
-        <source>1 year</source>
-        <translation>1 year</translation>
+        <translation><numerusform>%n month(s)</numerusform><numerusform>%n month(s)</numerusform></translation>
     </message>
     <message>
         <source>Apply generated password?</source>
@@ -1393,6 +1780,26 @@ Do you want to merge your changes?</translation>
         <source>Entry updated successfully.</source>
         <translation>Entry updated successfully.</translation>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation>Entry has unsaved changes</translation>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation>New attribute %1</translation>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation>[PROTECTED] Press reveal to view or edit</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n year(s)</numerusform><numerusform>%n year(s)</numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation>Confirm Removal</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1638,6 +2045,81 @@ Do you want to merge your changes?</translation>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation>Type:</translation>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation>Path:</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Password:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation>Inactive</translation>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation>Import from path</translation>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation>Export to path</translation>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation>Synchronize with path</translation>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation>Your KeePassXC version does not support sharing your container type. Please use %1.</translation>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation>Database sharing is disabled</translation>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation>Database export is disabled</translation>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation>Database import is disabled</translation>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation>KeeShare unsigned container</translation>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation>KeeShare signed container</translation>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation>Select import source</translation>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation>Select export target</translation>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation>Select import/export file</translation>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1695,10 +2177,6 @@ Do you want to merge your changes?</translation>
         <translation>Unable to fetch favicon.</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>Images</translation>
     </message>
@@ -1707,14 +2185,6 @@ Do you want to merge your changes?</translation>
         <translation>All files</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Select Image</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read icon</source>
-        <translation>Can&apos;t read icon</translation>
-    </message>
-    <message>
         <source>Custom icon already exists</source>
         <translation>Custom icon already exists</translation>
     </message>
@@ -1723,8 +2193,36 @@ Do you want to merge your changes?</translation>
         <translation>Confirm Delete</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation>Custom icon successfully downloaded</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</translation>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation>Select Image(s)</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation><numerusform>Successfully loaded %1 of %n icon(s)</numerusform><numerusform>Successfully loaded %1 of %n icon(s)</numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation>No icons were loaded</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation><numerusform>%n icon(s) already exist in the database</numerusform><numerusform>%n icon(s) already exist in the database</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation><numerusform>The following icon(s) failed:</numerusform><numerusform>The following icon(s) failed:</numerusform></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>This icon is used by %n entry(s), and will be replaced by the default icon. Are you sure you want to delete it?</numerusform><numerusform>This icon is used by %n entry(s), and will be replaced by the default icon. Are you sure you want to delete it?</numerusform></translation>
     </message>
 </context>
 <context>
@@ -1743,7 +2241,7 @@ Do you want to merge your changes?</translation>
     </message>
     <message>
         <source>Uuid:</source>
-        <translation>UUID:</translation>
+        <translation>Uuid:</translation>
     </message>
     <message>
         <source>Plugin Data</source>
@@ -1775,9 +2273,8 @@ This may cause the affected plugins to malfunction.</translation>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation> - Clone</translation>
+        <source>%1 - Clone</source>
+        <translation>%1 - Clone</translation>
     </message>
 </context>
 <context>
@@ -1819,11 +2316,7 @@ This may cause the affected plugins to malfunction.</translation>
     </message>
     <message numerus="yes">
         <source>Are you sure you want to remove %n attachment(s)?</source>
-        <translation><numerusform>Are you sure you want to remove %n attachment?</numerusform><numerusform>Are you sure you want to remove %n attachments?</numerusform></translation>
-    </message>
-    <message>
-        <source>Confirm Remove</source>
-        <translation>Confirm Remove</translation>
+        <translation><numerusform>Are you sure you want to remove %n attachment(s)?</numerusform><numerusform>Are you sure you want to remove %n attachment(s)?</numerusform></translation>
     </message>
     <message>
         <source>Save attachments</source>
@@ -1862,10 +2355,15 @@ This may cause the affected plugins to malfunction.</translation>
 %1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation>Confirm remove</translation>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>Unable to open files:
-%1</translation>
+        <translation><numerusform>Unable to open file(s):
+%1</numerusform><numerusform>Unable to open file(s):
+%1</numerusform></translation>
     </message>
 </context>
 <context>
@@ -1949,6 +2447,106 @@ This may cause the affected plugins to malfunction.</translation>
         <source>Attachments</source>
         <translation>Attachments</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>Yes</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>Generate TOTP Token</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Close</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Username</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Password</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Expiration</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>Attributes</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Attachments</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notes</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Autotype</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Window</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Sequence</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Searching</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Search</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Clear</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Never</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[PROTECTED]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Enabled</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Disabled</translation>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation>Share</translation>
+    </message>
 </context>
 <context>
     <name>EntryView</name>
@@ -1987,6 +2585,19 @@ This may cause the affected plugins to malfunction.</translation>
         <source>Recycle Bin</source>
         <translation>Recycle Bin</translation>
     </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation>[empty]</translation>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation>%1</translation>
+    </message>
 </context>
 <context>
     <name>HostInstaller</name>
@@ -2000,61 +2611,6 @@ This may cause the affected plugins to malfunction.</translation>
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>Length:</translation>
-    </message>
-    <message>
-        <source>Character Types</source>
-        <translation>Character Types</translation>
-    </message>
-    <message>
-        <source>Upper Case Letters</source>
-        <translation>Upper Case Letters</translation>
-    </message>
-    <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
-    </message>
-    <message>
-        <source>Lower Case Letters</source>
-        <translation>Lower Case Letters</translation>
-    </message>
-    <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
-    </message>
-    <message>
-        <source>Numbers</source>
-        <translation>Numbers</translation>
-    </message>
-    <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
-    </message>
-    <message>
-        <source>Special Characters</source>
-        <translation>Special Characters</translation>
-    </message>
-    <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
-    </message>
-    <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Exclude look-alike characters</translation>
-    </message>
-    <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>Ensure that the password contains characters from every group</translation>
-    </message>
-    <message>
-        <source>Extended ASCII</source>
-        <translation>Extended ASCII</translation>
-    </message>
-</context>
-<context>
     <name>KMessageWidget</name>
     <message>
         <source>&amp;Close</source>
@@ -2079,6 +2635,26 @@ This may cause the affected plugins to malfunction.</translation>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Wrong key or database file is corrupt.</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation>missing database headers</translation>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation>Header doesn&apos;t match hash</translation>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>Invalid header id size</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>Invalid header field length</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>Invalid header data length</translation>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2238,10 +2814,6 @@ This may cause the affected plugins to malfunction.</translation>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation>Invalid cipher UUID length</translation>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation>Unsupported cipher</translation>
     </message>
@@ -2295,6 +2867,18 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Unsupported KeePass 2 database version.</source>
         <translation>Unsupported KeePass 2 database version.</translation>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation>Invalid cipher uuid length: %1 (length=%2)</translation>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation>Unable to parse UUID: %1</translation>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation>Failed to read database file.</translation>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2308,7 +2892,7 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>Missing icon uuid or data</source>
-        <translation>Missing icon UUID or data</translation>
+        <translation>Missing icon uuid or data</translation>
     </message>
     <message>
         <source>Missing custom data key or value</source>
@@ -2320,7 +2904,7 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>Null group uuid</source>
-        <translation>Null group UUID</translation>
+        <translation>Null group uuid</translation>
     </message>
     <message>
         <source>Invalid group icon number</source>
@@ -2336,19 +2920,19 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>No group uuid found</source>
-        <translation>No group UUID found</translation>
+        <translation>No group uuid found</translation>
     </message>
     <message>
         <source>Null DeleteObject uuid</source>
-        <translation>Null DeleteObject UUID</translation>
+        <translation>Null DeleteObject uuid</translation>
     </message>
     <message>
         <source>Missing DeletedObject uuid or time</source>
-        <translation>Missing DeletedObject UUID or time</translation>
+        <translation>Missing DeletedObject uuid or time</translation>
     </message>
     <message>
         <source>Null entry uuid</source>
-        <translation>Null entry UUID</translation>
+        <translation>Null entry uuid</translation>
     </message>
     <message>
         <source>Invalid entry icon number</source>
@@ -2360,15 +2944,11 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>No entry uuid found</source>
-        <translation>No entry UUID found</translation>
+        <translation>No entry uuid found</translation>
     </message>
     <message>
         <source>History element with different uuid</source>
-        <translation>History element with different UUID</translation>
-    </message>
-    <message>
-        <source>Unable to decrypt entry string</source>
-        <translation>Unable to decrypt entry string</translation>
+        <translation>History element with different uuid</translation>
     </message>
     <message>
         <source>Duplicate custom attribute found</source>
@@ -2388,7 +2968,7 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>Auto-type association window or sequence missing</source>
-        <translation>Auto-Type association window or sequence missing</translation>
+        <translation>Auto-type association window or sequence missing</translation>
     </message>
     <message>
         <source>Invalid bool value</source>
@@ -2412,13 +2992,21 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>Invalid uuid value</source>
-        <translation>Invalid UUID value</translation>
+        <translation>Invalid uuid value</translation>
     </message>
     <message>
         <source>Unable to decompress binary</source>
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation>Unable to decompress binary</translation>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation>XML error:
+%1
+Line %2, column %3</translation>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2582,28 +3170,130 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Invalid entry field type</source>
         <translation>Invalid entry field type</translation>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation>unable to seek to content position</translation>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>Existing single-instance lock file is invalid. Launching new instance.</translation>
+        <source>Disabled share</source>
+        <translation>Disabled share</translation>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>The lock file could not be created. Single-instance mode disabled.</translation>
+        <source>Import from</source>
+        <translation>Import from</translation>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Another instance of KeePassXC is already running.</translation>
+        <source>Export to</source>
+        <translation>Export to</translation>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Fatal error while testing the cryptographic functions.</translation>
+        <source>Synchronize with</source>
+        <translation>Synchronize with</translation>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Error</translation>
+        <source>Key Component</source>
+        <translation>Key Component</translation>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation>Key Component Description</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancel</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation>Key Component set, click to change or remove</translation>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation>Add %1</translation>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation>Change %1</translation>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation>Remove %1</translation>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation>%1 set, click to change or remove</translation>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>Browse</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Generate</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation>Key File</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;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;</translation>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation>Legacy key file format</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>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.</translation>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation>Error loading the key file &apos;%1&apos;
+Message: %2</translation>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Key files</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>All files</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Create Key File...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation>Error creating key file</translation>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation>Unable to create key file: %1</translation>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Select a key file</translation>
     </message>
 </context>
 <context>
@@ -2617,10 +3307,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Recent databases</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Import</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
@@ -2629,14 +3315,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>E&amp;ntries</translation>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>Copy att&amp;ribute to clipboard</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation>Time-based one-time password</translation>
-    </message>
-    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Groups</translation>
     </message>
@@ -2665,30 +3343,10 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Close database</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>&amp;New database</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>Merge from KeePassXC database</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>&amp;Add new entry</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>&amp;View/Edit entry</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>&amp;Delete entry</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>&amp;Add new group</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>&amp;Edit group</translation>
     </message>
@@ -2701,14 +3359,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Sa&amp;ve database as...</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Change &amp;master key...</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>&amp;Database settings</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>Database settings</translation>
     </message>
@@ -2717,10 +3367,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Clone entry</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>&amp;Find</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>Copy &amp;username</translation>
     </message>
@@ -2729,10 +3375,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Copy username to clipboard</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>Cop&amp;y password</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>Copy password to clipboard</translation>
     </message>
@@ -2745,14 +3387,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Password Generator</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation>&amp;Perform Auto-Type</translation>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>&amp;Open URL</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>&amp;Lock databases</translation>
     </message>
@@ -2785,22 +3419,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Export to CSV file...</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Import KeePass 1 database...</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>Import CSV file...</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Re&amp;pair database...</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>Show TOTP</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>Set up TOTP...</translation>
     </message>
@@ -2821,14 +3439,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Access error for config file %1</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>read-only</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Settings</translation>
     </message>
@@ -2841,36 +3451,279 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Quit KeePassXC</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 Database</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Please touch the button on your YubiKey!</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>All files</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</translation>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Open database</translation>
+        <source>&amp;Donate</source>
+        <translation>&amp;Donate</translation>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Save repaired database</translation>
+        <source>Report a &amp;bug</source>
+        <translation>Report a &amp;bug</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Writing the database failed.</translation>
+        <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>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.</translation>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Please touch the button on your YubiKey!</translation>
+        <source>&amp;Import</source>
+        <translation>&amp;Import</translation>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
-        <translation>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</translation>
+        <source>Copy att&amp;ribute...</source>
+        <translation>Copy att&amp;ribute...</translation>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation>TOTP...</translation>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation>&amp;New database...</translation>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation>Create a new database</translation>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation>&amp;Merge from database...</translation>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation>Merge from another KDBX database</translation>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation>&amp;New entry</translation>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation>Add a new entry</translation>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation>&amp;Edit entry</translation>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation>View or edit entry</translation>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation>&amp;New group</translation>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation>Add a new group</translation>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation>Change master &amp;key...</translation>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation>&amp;Database settings...</translation>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation>Copy &amp;password</translation>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation>Perform &amp;Auto-Type</translation>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation>Open &amp;URL</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation>KeePass 1 database...</translation>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation>Import a KeePass 1 database</translation>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation>CSV file...</translation>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation>Import a CSV file</translation>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation>Show TOTP...</translation>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation>Show TOTP QR Code...</translation>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation>Check for Updates...</translation>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation>Share entry</translation>
+    </message>
+    <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>NOTE: You are using a pre-release version of KeePassXC!
+Expect some bugs and minor issues, this version is not meant for production use.</translation>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation>Check for updates on startup?</translation>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation>Would you like KeePassXC to check for updates on startup?</translation>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation>You can always check for updates manually from the application menu.</translation>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation>Creating missing %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation>Relocating %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation>Overwriting %1 [%2]</translation>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation>older entry merged from database &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation>Adding backup for older target %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation>Adding backup for older source %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation>Reapplying older target entry on top of newer source %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation>Reapplying older source entry on top of newer target %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation>Synchronizing from newer source %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation>Synchronizing from older source %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation>Deleting child %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation>Deleting orphan %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation>Changed deleted objects</translation>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation>Adding missing icon %1</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation>Create a new KeePassXC database...</translation>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Root</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation>En&amp;cryption Settings</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>Here you can adjust the database encryption settings. Don&apos;t worry, you can change them later in the database settings.</translation>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Advanced Settings</translation>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation>Simple Settings</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <translation>Encryption Settings</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>Here you can adjust the database encryption settings. Don&apos;t worry, you can change them later in the database settings.</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation>Database Master Key</translation>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation>A master key known only to you protects your database.</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <translation>General Database Information</translation>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation>Please fill in the display name and an optional description for your new database:</translation>
     </message>
 </context>
 <context>
@@ -2973,125 +3826,34 @@ This version is not meant for production use.</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>This is required for accessing your databases from ChromeIPass or PassIFox</translation>
-    </message>
-    <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>Enable KeePassHTTP server</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>General</translation>
-    </message>
-    <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>Sh&amp;ow a notification when credentials are requested</translation>
-    </message>
-    <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>Only returns the best matches for a specific URL instead of all entries for the whole domain.</translation>
-    </message>
-    <message>
-        <source>&amp;Return only best matching entries</source>
-        <translation>&amp;Return only best matching entries</translation>
-    </message>
-    <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Re&amp;quest to unlock the database if it is locked</translation>
-    </message>
-    <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</translation>
-    </message>
-    <message>
-        <source>&amp;Match URL schemes</source>
-        <translation>&amp;Match URL schemes</translation>
-    </message>
-    <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Sort matching entries by &amp;username</translation>
-    </message>
-    <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Sort &amp;matching entries by title</translation>
-    </message>
-    <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>R&amp;emove all shared encryption keys from active database</translation>
-    </message>
-    <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>Re&amp;move all stored permissions from entries in active database</translation>
-    </message>
-    <message>
-        <source>Password Generator</source>
-        <translation>Password Generator</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Advanced</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Always allow &amp;access to entries</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Always allow &amp;updating entries</translation>
-    </message>
-    <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>Only the selected database has to be connected with a client.</translation>
-    </message>
-    <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Searc&amp;h in all opened databases for matching entries</translation>
-    </message>
-    <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>Automatically creating or updating string fields is not supported.</translation>
-    </message>
-    <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>&amp;Return advanced string fields which start with &quot;KPH: &quot;</translation>
-    </message>
-    <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP Port:</translation>
+        <source>Enter password:</source>
+        <translation>Enter password:</translation>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Default port: 19455</translation>
+        <source>Confirm password:</source>
+        <translation>Confirm password:</translation>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC will listen to this port on 127.0.0.1</translation>
+        <source>Password</source>
+        <translation>Password</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</translation>
+        <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;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;</translation>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</translation>
+        <source>Password cannot be empty.</source>
+        <translation>Password cannot be empty.</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Cannot bind to privileged ports</translation>
+        <source>Passwords do not match.</source>
+        <translation>Passwords do not match.</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Cannot bind to privileged ports below 1024!
-Using default port 19455.</translation>
+        <source>Generate master password</source>
+        <translation>Generate master password</translation>
     </message>
 </context>
 <context>
@@ -3162,18 +3924,10 @@ Using default port 19455.</translation>
         <translation>Wordlist:</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Word Count:</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>Word Separator:</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>Generate</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Copy</translation>
     </message>
@@ -3186,10 +3940,6 @@ Using default port 19455.</translation>
         <translation>Close</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>Apply</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>Entropy: %1 bit</translation>
     </message>
@@ -3217,6 +3967,171 @@ Using default port 19455.</translation>
         <comment>Password quality</comment>
         <translation>Excellent</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation>ExtendedASCII</translation>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation>Switch to advanced mode</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Advanced</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation>Upper Case Letters A to F</translation>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation>Lower Case Letters A to F</translation>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation>Braces</translation>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation>{[(</translation>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation>Punctuation</translation>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation>.,:;</translation>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation>Quotes</translation>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation>&quot; &apos;</translation>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation>Math</translation>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation>&lt;*+!?=</translation>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation>Dashes</translation>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation>\_|-/</translation>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation>Logograms</translation>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation>#$%&amp;&amp;@^`~</translation>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation>Switch to simple mode</translation>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation>Simple</translation>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation>Character set to exclude from generated password</translation>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation>Do not include:</translation>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation>Add non-hex letters to &quot;do not include&quot; list</translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation>Hex</translation>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</translation>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation>Word Co&amp;unt:</translation>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation>Regenerate</translation>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation>KeeShare</translation>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation>Select</translation>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation>Overwrite</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Delete</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation>Move</translation>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation>Empty</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Remove</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation>Skip</translation>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Disable</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation>Merge</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3237,34 +4152,18 @@ Using default port 19455.</translation>
         <translation>Cannot decrypt message</translation>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
-        <translation>Timeout or cannot connect to KeePassXC</translation>
-    </message>
-    <message>
         <source>Action cancelled or denied</source>
         <translation>Action cancelled or denied</translation>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</translation>
-    </message>
-    <message>
         <source>KeePassXC association failed, try again</source>
         <translation>KeePassXC association failed, try again</translation>
     </message>
     <message>
-        <source>Key change was not successful</source>
-        <translation>Key change was not successful</translation>
-    </message>
-    <message>
         <source>Encryption key is not recognized</source>
         <translation>Encryption key is not recognized</translation>
     </message>
     <message>
-        <source>No saved databases found</source>
-        <translation>No saved databases found</translation>
-    </message>
-    <message>
         <source>Incorrect action</source>
         <translation>Incorrect action</translation>
     </message>
@@ -3390,10 +4289,6 @@ Using default port 19455.</translation>
         <translation>Insert password to unlock %1: </translation>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation>Failed to load key file %1 : %2</translation>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3478,12 +4373,6 @@ Available commands:
         <translation>error reading from device</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>file empty !
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation>malformed string</translation>
     </message>
@@ -3492,30 +4381,6 @@ Available commands:
         <translation>missing closing quote</translation>
     </message>
     <message>
-        <source>AES: 256-bit</source>
-        <translation>AES: 256-bit</translation>
-    </message>
-    <message>
-        <source>Twofish: 256-bit</source>
-        <translation>Twofish: 256-bit</translation>
-    </message>
-    <message>
-        <source>ChaCha20: 256-bit</source>
-        <translation>ChaCha20: 256-bit</translation>
-    </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – recommended)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 4)</source>
-        <translation>AES-KDF (KDBX 4)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 3.1)</source>
-        <translation>AES-KDF (KDBX 3.1)</translation>
-    </message>
-    <message>
         <source>Group</source>
         <translation>Group</translation>
     </message>
@@ -3544,10 +4409,6 @@ Available commands:
         <translation>Created</translation>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
-        <translation>Legacy Browser Integration</translation>
-    </message>
-    <message>
         <source>Browser Integration</source>
         <translation>Browser Integration</translation>
     </message>
@@ -3576,10 +4437,6 @@ Available commands:
         <translation>Word count for the diceware passphrase.</translation>
     </message>
     <message>
-        <source>count</source>
-        <translation>count</translation>
-    </message>
-    <message>
         <source>Wordlist for the diceware generator.
 [Default: EFF English]</source>
         <translation>Wordlist for the diceware generator.
@@ -3590,28 +4447,441 @@ Available commands:
         <translation>Generate a new random password.</translation>
     </message>
     <message>
-        <source>Length of the generated password.</source>
-        <translation>Length of the generated password.</translation>
+        <source>Invalid value for password length %1.</source>
+        <translation>Invalid value for password length %1.</translation>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation>Could not create entry with path %1.</translation>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation>Enter password for new entry: </translation>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation>Writing the database failed %1.</translation>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation>Successfully added entry %1.</translation>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
-        <translation>Use lowercase characters in the generated password.</translation>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation>Copy the current TOTP to the clipboard.</translation>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
-        <translation>Use uppercase characters in the generated password.</translation>
+        <source>Invalid timeout value %1.</source>
+        <translation>Invalid timeout value %1.</translation>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
-        <translation>Use numbers in the generated password.</translation>
+        <source>Entry %1 not found.</source>
+        <translation>Entry %1 not found.</translation>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
-        <translation>Use special characters in the generated password.</translation>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation>Entry with path %1 has no TOTP set up.</translation>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
-        <translation>Use extended ASCII in the generated password.</translation>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation>Entry&apos;s current TOTP copied to the clipboard!</translation>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation>Entry&apos;s password copied to the clipboard!</translation>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation><numerusform>Clearing the clipboard in %1 second(s)...</numerusform><numerusform>Clearing the clipboard in %1 second(s)...</numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation>Clipboard cleared!</translation>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation>Silence password prompt and other secondary outputs.</translation>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation>count</translation>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation>Invalid value for password length: %1</translation>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation>Could not find entry with path %1.</translation>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation>Not changing any field for entry %1.</translation>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation>Enter new password for entry: </translation>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation>Writing the database failed: %1</translation>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation>Successfully edited entry %1.</translation>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation>Length %1</translation>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation>Entropy %1</translation>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation>Log10 %1</translation>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation>Multi-word extra bits %1</translation>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation>Type: Bruteforce</translation>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation>Type: Dictionary</translation>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation>Type: Dict+Leet</translation>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation>Type: User Words</translation>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation>Type: User+Leet</translation>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation>Type: Repeated</translation>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation>Type: Sequence</translation>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation>Type: Spatial</translation>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation>Type: Date</translation>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation>Type: Bruteforce(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation>Type: Dictionary(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation>Type: Dict+Leet(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation>Type: User Words(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation>Type: User+Leet(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation>Type: Repeated(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation>Type: Sequence(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation>Type: Spatial(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation>Type: Date(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation>Type: Unknown%1</translation>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation>Entropy %1 (%2)</translation>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation>*** Password length (%1) != sum of length of parts (%2) ***</translation>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation>Failed to load key file %1: %2</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>File %1 does not exist.</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Unable to open file %1.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation>Error while reading the database:
+%1</translation>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation>Error while parsing the database:
+%1</translation>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation>Length of the generated password</translation>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation>Use lowercase characters</translation>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation>Use uppercase characters</translation>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation>Use numbers.</translation>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation>Use special characters</translation>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation>Use extended ASCII</translation>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation>Exclude character set</translation>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation>chars</translation>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation>Exclude similar looking characters</translation>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation>Include characters from every selected group</translation>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation>Recursively list the elements of the group.</translation>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation>Cannot find group %1.</translation>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation>Error reading merge file:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation>Unable to save database to file : %1</translation>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation>Unable to save database to file: %1</translation>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation>Successfully recycled entry %1.</translation>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation>Successfully deleted entry %1.</translation>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation>Show the entry&apos;s current TOTP.</translation>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation>ERROR: unknown attribute %1.</translation>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation>No program defined for clipboard manipulation</translation>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation>Unable to start program %1</translation>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation>file empty</translation>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation>%1: (row, col) %2,%3</translation>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256-bit</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256-bit</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256-bit</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – recommended)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation>Invalid Settings</translation>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation>Invalid Key</translation>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation>Message encryption failed.</translation>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation>No groups found</translation>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation>Create a new database.</translation>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation>File %1 already exists.</translation>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation>Loading the key file failed</translation>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation>No key is set. Aborting database creation.</translation>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation>Failed to save the database: %1.</translation>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation>Successfully created new database.</translation>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation>Insert password to encrypt database (Press enter to leave blank): </translation>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation>Creating KeyFile %1 failed: %2</translation>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation>Loading KeyFile %1 failed: %2</translation>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>Remove an entry from the database.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>Path of the entry to remove.</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>Existing single-instance lock file is invalid. Launching new instance.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>The lock file could not be created. Single-instance mode disabled.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - cross-platform password manager</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>filenames of the password databases to open (*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>path to a custom config file</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>key file of the database</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>read password of the database from stdin</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation>Parent window handle</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Another instance of KeePassXC is already running.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Fatal error while testing the cryptographic functions.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Error</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation>Database password: </translation>
     </message>
 </context>
 <context>
@@ -3649,12 +4919,98 @@ Available commands:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
+    <message>
+        <source>Agent connection failed.</source>
+        <translation>Agent connection failed.</translation>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation>Agent protocol error.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation>No agent running, cannot add identity.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation>No agent running, cannot remove identity.</translation>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation>Agent refused this identity. Possible reasons include:</translation>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation>The key has already been added.</translation>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation>Restricted lifetime is not supported by the agent (check options).</translation>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation>A confirmation request is not supported by the agent (check options).</translation>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation>Search Help</translation>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</translation>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation>Every search term must match (ie, logical AND)</translation>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation>Modifiers</translation>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation>exclude term from results</translation>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation>match term exactly</translation>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation>use regex in term</translation>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation>Fields</translation>
+    </message>
     <message>
-        <source>Search...</source>
-        <translation>Search...</translation>
+        <source>Term Wildcards</source>
+        <translation>Term Wildcards</translation>
     </message>
     <message>
+        <source>match anything</source>
+        <translation>match anything</translation>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation>match one</translation>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation>logical OR</translation>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation>Examples</translation>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
         <source>Search</source>
         <translation>Search</translation>
     </message>
@@ -3663,314 +5019,316 @@ Available commands:
         <translation>Clear</translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Case Sensitive</translation>
-    </message>
-    <message>
         <source>Limit search to selected group</source>
         <translation>Limit search to selected group</translation>
     </message>
+    <message>
+        <source>Search Help</source>
+        <translation>Search Help</translation>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation>Search (%1)...</translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation>Case sensitive</translation>
+    </message>
 </context>
 <context>
-    <name>Service</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC: New key association request</translation>
+        <source>Active</source>
+        <translation>Active</translation>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</translation>
+        <source>Allow export</source>
+        <translation>Allow export</translation>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: Overwrite existing key?</translation>
+        <source>Allow import</source>
+        <translation>Allow import</translation>
     </message>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</translation>
+        <source>Own certificate</source>
+        <translation>Own certificate</translation>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: Update Entry</translation>
+        <source>Fingerprint:</source>
+        <translation>Fingerprint:</translation>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Do you want to update the information in %1 - %2?</translation>
+        <source>Certificate:</source>
+        <translation>Certificate:</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Database locked!</translation>
+        <source>Signer</source>
+        <translation>Signer</translation>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</translation>
+        <source>Key:</source>
+        <translation>Key:</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Removed keys from database</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation><numerusform>Successfully removed %n encryption key from KeePassXC/HTTP Settings.</numerusform><numerusform>Successfully removed %n encryption keys from KeePassXC/HTTP Settings.</numerusform></translation>
+        <source>Generate</source>
+        <translation>Generate</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: No keys found</translation>
+        <source>Import</source>
+        <translation>Import</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>No shared encryption-keys found in KeePassHttp Settings.</translation>
+        <source>Export</source>
+        <translation>Export</translation>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Settings not available!</translation>
+        <source>Imported certificates</source>
+        <translation>Imported certificates</translation>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>The active database does not contain an entry of KeePassHttp Settings.</translation>
+        <source>Trust</source>
+        <translation>Trust</translation>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>Removing stored permissions...</translation>
+        <source>Ask</source>
+        <translation>Ask</translation>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>Abort</translation>
+        <source>Untrust</source>
+        <translation>Untrust</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Removed permissions</translation>
+        <source>Remove</source>
+        <translation>Remove</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation><numerusform>Successfully removed permissions from %n entry.</numerusform><numerusform>Successfully removed permissions from %n entries.</numerusform></translation>
+    <message>
+        <source>Path</source>
+        <translation>Path</translation>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: No entry with permissions found!</translation>
+        <source>Status</source>
+        <translation>Status</translation>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>The active database does not contain an entry with permissions.</translation>
+        <source>Fingerprint</source>
+        <translation>Fingerprint</translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
-        <translation>Application Settings</translation>
+        <source>Certificate</source>
+        <translation>Certificate</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>General</translation>
+        <source>Trusted</source>
+        <translation>Trusted</translation>
     </message>
     <message>
-        <source>Security</source>
-        <translation>Security</translation>
+        <source>Untrusted</source>
+        <translation>Untrusted</translation>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>Access error for config file %1</translation>
+        <source>Unknown</source>
+        <translation>Unknown</translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>Basic Settings</translation>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation>key.share</translation>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Start only a single instance of KeePassXC</translation>
+        <source>KeeShare key file</source>
+        <translation>KeeShare key file</translation>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>Remember last databases</translation>
+        <source>All files</source>
+        <translation>All files</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Remember last key files and security dongles</translation>
+        <source>Select path</source>
+        <translation>Select path</translation>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Load previous databases on startup</translation>
+        <source>Exporting changed certificate</source>
+        <translation>Exporting changed certificate</translation>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>Automatically save on exit</translation>
+        <source>The exported certificate is not the same as the one in use. Do you want to export the current certificate?</source>
+        <translation>The exported certificate is not the same as the one in use. Do you want to export the current certificate?</translation>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>Automatically save after every change</translation>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation>%1.%2</translation>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Automatically reload the database when modified externally</translation>
+        <source>Import from container without signature</source>
+        <translation>Import from container without signature</translation>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>Minimize when copying to clipboard</translation>
+        <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>We cannot verify the source of the shared container because it is not signed. Do you really want to import from %1?</translation>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Minimize window at application startup</translation>
+        <source>Import from container with certificate</source>
+        <translation>Import from container with certificate</translation>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>Use group icon on entry creation</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation>Do you want to trust %1 with the fingerprint of %2 from %3</translation>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</translation>
+        <source>Not this time</source>
+        <translation>Not this time</translation>
     </message>
     <message>
-        <source>Hide the Details view</source>
-        <translation>Hide the Details view</translation>
+        <source>Never</source>
+        <translation>Never</translation>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>Show a system tray icon</translation>
+        <source>Always</source>
+        <translation>Always</translation>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>Hide window to system tray when minimized</translation>
+        <source>Just this time</source>
+        <translation>Just this time</translation>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
-        <translation>Hide window to system tray instead of app exit</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation>Import from %1 failed (%2)</translation>
     </message>
     <message>
-        <source>Dark system tray icon</source>
-        <translation>Dark system tray icon</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation>Import from %1 successful (%2)</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Language</translation>
+        <source>Imported from %1</source>
+        <translation>Imported from %1</translation>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Auto-Type</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation>Signed share container are not supported - import prevented</translation>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>Use entry title to match windows for global Auto-Type</translation>
+        <source>File is not readable</source>
+        <translation>File is not readable</translation>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>Use entry URL to match windows for global Auto-Type</translation>
+        <source>Invalid sharing container</source>
+        <translation>Invalid sharing container</translation>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation>Always ask before performing Auto-Type</translation>
+        <source>Untrusted import prevented</source>
+        <translation>Untrusted import prevented</translation>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Global Auto-Type shortcut</translation>
+        <source>Successful signed import</source>
+        <translation>Successful signed import</translation>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>Auto-Type delay</translation>
+        <source>Unexpected error</source>
+        <translation>Unexpected error</translation>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation> ms</translation>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation>Unsigned share container are not supported - import prevented</translation>
     </message>
     <message>
-        <source>Startup</source>
-        <translation>Startup</translation>
+        <source>Successful unsigned import</source>
+        <translation>Successful unsigned import</translation>
     </message>
     <message>
-        <source>File Management</source>
-        <translation>File Management</translation>
+        <source>File does not exist</source>
+        <translation>File does not exist</translation>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation>Safely save database files (may be incompatible with Dropbox, etc)</translation>
+        <source>Unknown share container type</source>
+        <translation>Unknown share container type</translation>
     </message>
     <message>
-        <source>Backup database file before saving</source>
-        <translation>Backup database file before saving</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation>Overwriting signed share container is not supported - export prevented</translation>
     </message>
     <message>
-        <source>Entry Management</source>
-        <translation>Entry Management</translation>
+        <source>Could not write export container (%1)</source>
+        <translation>Could not write export container (%1)</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>General</translation>
+        <source>Could not embed signature (%1)</source>
+        <translation>Could not embed signature (%1)</translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
-        <translation>Timeouts</translation>
+        <source>Could not embed database (%1)</source>
+        <translation>Could not embed database (%1)</translation>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>Clear clipboard after</translation>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation>Overwriting unsigned share container is not supported - export prevented</translation>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> sec</translation>
+        <source>Could not write export container</source>
+        <translation>Could not write export container</translation>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>Lock databases after inactivity of</translation>
+        <source>Unexpected export error occurred</source>
+        <translation>Unexpected export error occurred</translation>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Convenience</translation>
+        <source>Export to %1 failed (%2)</source>
+        <translation>Export to %1 failed (%2)</translation>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Lock databases when session is locked or lid is closed</translation>
+        <source>Export to %1 successful (%2)</source>
+        <translation>Export to %1 successful (%2)</translation>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>Lock databases after minimizing the window</translation>
+        <source>Export to %1</source>
+        <translation>Export to %1</translation>
     </message>
+</context>
+<context>
+    <name>TotpDialog</name>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>Don&apos;t require password repeat when it is visible</translation>
+        <source>Timed Password</source>
+        <translation>Timed Password</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Show passwords in cleartext by default</translation>
+        <source>000000</source>
+        <translation>000000</translation>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
-        <translation>Hide passwords in the preview panel</translation>
+        <source>Copy</source>
+        <translation>Copy</translation>
+    </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation><numerusform>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</numerusform><numerusform>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</numerusform></translation>
     </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
     <message>
-        <source>Hide entry notes by default</source>
-        <translation>Hide entry notes by default</translation>
+        <source>Copy</source>
+        <translation>Copy</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>Privacy</translation>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation>NOTE: These TOTP settings are custom and may not work with other authenticators.</translation>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>Use Google as fallback for downloading website icons</translation>
+        <source>There was an error creating the QR code.</source>
+        <translation>There was an error creating the QR code.</translation>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
-        <translation>Re-lock previously locked database after performing Auto-Type</translation>
+        <source>Closing in %1 seconds.</source>
+        <translation>Closing in %1 seconds.</translation>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation>Setup TOTP</translation>
@@ -3992,59 +5350,84 @@ Please unlock the selected database or choose another one which is unlocked.</tr
         <translation>Use custom settings</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>Note: Change these settings only if you know what you are doing.</translation>
+        <source>Custom Settings</source>
+        <translation>Custom Settings</translation>
     </message>
     <message>
         <source>Time step:</source>
         <translation>Time step:</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8 digits</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> sec</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>Code size:</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6 digits</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>Code size:</translation>
+        <source>7 digits</source>
+        <translation>7 digits</translation>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> sec</translation>
+        <source>8 digits</source>
+        <translation>8 digits</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>Timed Password</translation>
+        <source>Checking for updates</source>
+        <translation>Checking for updates</translation>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation>Checking for updates...</translation>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Copy</translation>
+        <source>Close</source>
+        <translation>Close</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>Expires in</translation>
+        <source>Update Error!</source>
+        <translation>Update Error!</translation>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>seconds</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation>An error occurred in retrieving update information.</translation>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation>Please try again later.</translation>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation>Software Update</translation>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation>A new version of KeePassXC is available!</translation>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation>KeePassXC %1 is now available — you have %2.</translation>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>Unlock database</translation>
+        <source>Download it at keepassxc.org</source>
+        <translation>Download it at keepassxc.org</translation>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation>You&apos;re up-to-date!</translation>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation>KeePassXC %1 is currently the newest version available</translation>
     </message>
 </context>
 <context>
@@ -4079,42 +5462,26 @@ Please unlock the selected database or choose another one which is unlocked.</tr
     </message>
 </context>
 <context>
-    <name>main</name>
-    <message>
-        <source>Remove an entry from the database.</source>
-        <translation>Remove an entry from the database.</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>Path of the database.</translation>
-    </message>
-    <message>
-        <source>Path of the entry to remove.</source>
-        <translation>Path of the entry to remove.</translation>
-    </message>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - cross-platform password manager</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>filenames of the password databases to open (*.kdbx)</translation>
+        <source>Refresh</source>
+        <translation>Refresh</translation>
     </message>
     <message>
-        <source>path to a custom config file</source>
-        <translation>path to a custom config file</translation>
+        <source>YubiKey Challenge-Response</source>
+        <translation>YubiKey Challenge-Response</translation>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>key file of the database</translation>
+        <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>&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;</translation>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>read password of the database from stdin</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation>No YubiKey detected, please ensure it&apos;s plugged in.</translation>
     </message>
     <message>
-        <source>Parent window handle</source>
-        <translation>Parent window handle</translation>
+        <source>No YubiKey inserted.</source>
+        <translation>No YubiKey inserted.</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_es.ts b/share/translations/keepassx_es.ts
index 6515762a5..452aeb86e 100644
--- a/share/translations/keepassx_es.ts
+++ b/share/translations/keepassx_es.ts
@@ -11,7 +11,7 @@
     </message>
     <message>
         <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
-        <translation>Reporte errores al: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
+        <translation>Reporte errores en: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
     </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>
@@ -38,12 +38,6 @@
         <translation>Copiar al portapapeles</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>Versión %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>Revisión: %1</translation>
     </message>
@@ -53,7 +47,7 @@
     </message>
     <message>
         <source>Libraries:</source>
-        <translation>Librerías:</translation>
+        <translation>Bibliotecas:</translation>
     </message>
     <message>
         <source>Operating system: %1
@@ -76,35 +70,48 @@ Núcleo: %3 %4</translation>
         <translation>El equipo de KeePassXC quiere agradecer de manera especial el trabajo de debfx por la creación de KeePassX.</translation>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
-        <translation>Tipo de Build: %1
-</translation>
+        <source>Version %1</source>
+        <translation>Versión %1</translation>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>Confirmar acceso para KeePassXC HTTP</translation>
+        <source>Build Type: %1</source>
+        <translation>Tipo de Compilación: %1</translation>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>Recordar esta decisión</translation>
+        <source>Auto-Type</source>
+        <translation>Auto-Escritura</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Permitir</translation>
+        <source>Browser Integration</source>
+        <translation>Integración con Navegadores</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>Denegar</translation>
+        <source>SSH Agent</source>
+        <translation>Agente de SSH</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>%1 ha solicitado acceso a las contraseñas de los siguientes item(s).
-Por favor seleccione si desea autorizar su acceso.</translation>
+        <source>YubiKey</source>
+        <translation>YubiKey</translation>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation>TouchID</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Ninguno</translation>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -113,6 +120,277 @@ Por favor seleccione si desea autorizar su acceso.</translation>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>Habilitar el Agente SSH (requiere reinicio)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Configuración de la aplicación</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Seguridad</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Error de acceso al archivo de configuración %1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Configuraciones Básicas</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>Inicio</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Inicie sólo una instancia de KeePassXC</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Recordar última base de datos</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Recordar los últimos archivos de llaves y el dongle de seguridad</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Abrir base de datos anterior al inicio</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>Minimizar la ventana al iniciar</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>Administración de archivos</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <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 base de datos antes de guardar</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Guardar automáticamente después de cada cambio</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Guardar automáticamente al salir</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <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 base de datos cuando sea modificada externamente</translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>Gestión de entrada</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>Usar icono del grupo en la creación de entrada</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Minimizar al copiar al portapapeles</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation>Ocultar entrada del panel de vista previa</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation>Ocultar barra de herramientas (iconos)</translation>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation>Minimizar en lugar de cerrar la aplicación</translation>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Mostrar icono en la bandeja de del sistema</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>Icono de bandeja del sistema oscuro</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Ocultar la ventana a la bandeja del sistema cuando se minimiza</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Idioma</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Auto-Escritura</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>Use título de entrada para acertar ventanas en Auto-Tipeado global.</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>Use URL para acertar ventanas en Auto-Tipedo global</translation>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>Siempre preguntar antes de hacer Auto-Escritura</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Atajo global de Auto-Escritura</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation>Escribiendo retardo de la Auto-Escritura</translation>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation>Micro segundo</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation>Iniciar retardo de Auto-Escritura</translation>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>Intervalos</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>Limpiar el portapapeles después de</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>segundos</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>Bloquear base de datos tras un periodo de inactividad de</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation> min</translation>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation>Olvidar TouchID después de una inactividad de</translation>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>Conveniencia</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Bloquear base 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>
+        <translation>Olvidar TouchID cuando la sesión está bloqueada o la tapa esté cerrada</translation>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>Bloquear base 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 base de datos tras realizar una Auto-Escritura </translation>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>No pedir repetición de la contraseña cuando está visible</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation>No ocultar las contraseñas durante la edición de ellas</translation>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation>No utilice marcador de posición para los campos de contraseña vacíos</translation>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation>Ocultar contraseñas en entrada del panel de vista previa</translation>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>Ocultar notas de entrada por defecto</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>Privacidad</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation>Utilice DuckDuckGo como alternativa para descargar iconos de sitios web</translation>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -130,19 +408,19 @@ Por favor seleccione si desea autorizar su acceso.</translation>
     </message>
     <message>
         <source>The Syntax of your Auto-Type statement is incorrect!</source>
-        <translation>¡La sintaxis de la declaración de tu auto-escritura es incorrecta!</translation>
+        <translation>¡La sintaxis de la declaración de su auto-escritura es incorrecta!</translation>
     </message>
     <message>
         <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
-        <translation>Este comando de Auto-Escritura contiene un retraso muy largo. ¿De verdad quieres continuar?</translation>
+        <translation>Este comando de Auto-Escritura contiene un retraso muy largo. ¿Realmente desea 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 Auto-Escritura contiene pulsaciones de teclas muy lentas. ¿De verdad quieres continuar?</translation>
+        <translation>Este comando de Auto-Escritura contiene pulsaciones de teclas muy lentas. ¿Realmente 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 comando de Auto-Escritura contiene argumentos que se repiten muy a menudo. ¿De verdad quieres continuar?</translation>
+        <translation>Este comando de Auto-Escritura contiene argumentos que se repiten muy a menudo. ¿Realmente desea continuar?</translation>
     </message>
 </context>
 <context>
@@ -216,6 +494,27 @@ Por favor seleccione si desea autorizar su acceso.</translation>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation>KeePassXC-Browser Guardar Entrada</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Listo</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation>Tienes múltiples bases de datos abiertas.
+Por favor, seleccione la base de datos correcta para guardar las credenciales.</translation>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -289,14 +588,6 @@ Por favor seleccione si desea autorizar su acceso.</translation>
         <translation>Ordenar las credenciales por &amp;usuario</translation>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>&amp;Desconectar todos los navegadores</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>Olvidar todos las &amp;permisos recordados</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>Avanzado</translation>
     </message>
@@ -362,14 +653,6 @@ Por favor seleccione si desea autorizar su acceso.</translation>
         <translation>&lt;b&gt;Advertencia:&lt;/b&gt; Las siguientes opciones pueden ser peligrosas.</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>Archivos ejecutables (*.exe); Todos los archivos (*. *)</translation>
-    </message>
-    <message>
-        <source>Executable Files (*)</source>
-        <translation>Archivos ejecutables (*)</translation>
-    </message>
-    <message>
         <source>Select custom proxy location</source>
         <translation>Elegir una ubicación de proxy personalizada</translation>
     </message>
@@ -377,6 +660,31 @@ Por favor seleccione si desea autorizar su acceso.</translation>
         <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
         <translation>Lo sentimos, pero KeePassXC-Browser no está soportado en las versiones Snap por el momento.</translation>
     </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation>KeePassXC-Browser es necesario para que la integración con el navegador funcione. Descárguelo para %1 y %2.</translation>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation>Navegador &amp;Tor</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: </source>
+        <translation>&lt;b&gt;Advertencia&lt;/b&gt;, no se encontró la aplicación keepassxc-proxy!&lt;br /&gt;Verifique el directorio de instalación de KeePassXC o confirme la ruta personalizada en las opciones avanzadas.&lt;br /&gt;La integración del navegador NO FUNCIONARÁ sin la aplicación proxy..&lt;br /&gt;Ruta esperada: </translation>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation>Archivos ejecutables</translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation>Todos los archivos</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"/>
+    </message>
 </context>
 <context>
     <name>BrowserService</name>
@@ -418,153 +726,46 @@ Do you want to overwrite it?</source>
         <translation>¿Desea actualizar la información en %1 - %2?</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: ¡Base de datos bloqueada!</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>¡La base de datos activa está bloqueada!
-Por favor desbloquee la base de datos seleccionada o elija otra que esté desbloqueada.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: ¡Configuraciones no disponibles!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation>La base de datos activa no contiene una entrada de configuraciones.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: No se encontró ninguna clave</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation>No se encontraron claves de cifrado en las configuraciones de KeePassXC.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <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>
-        <translation><numerusform>Quitado con éxito %n llave(s) de cifrado de la configuración de KeePassXC.</numerusform><numerusform>Quitado con éxito %n llave(s) de cifrado de la configuración de KeePassXC.</numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>Eliminando permisos almacenados...</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>Abortar</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Permisos eliminados</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation><numerusform>Los permisos fueron eliminados exitosamente de %n entrada(s).</numerusform><numerusform>Los permisos fueron eliminados exitosamente de %n entrada(s).</numerusform></translation>
-    </message>
-    <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <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 base de datos activa no contiene una entrada con permisos.</translation>
+        <source>Converting attributes to custom data…</source>
+        <translation>Convirtiendo atributos a datos personalizados ...</translation>
     </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
     <message>
-        <source>Password</source>
-        <translation>Contraseña</translation>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation>KeePassXC: atributos de KeePassHTTP convertidos</translation>
     </message>
     <message>
-        <source>Enter password:</source>
-        <translation>Ingrese la contraseña</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>Repita la contraseña:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;Archivo llave</translation>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation>Atributos exitosamente convertidos desde %1 entrada (s).
+Movió %2 claves a datos personalizados.</translation>
     </message>
-    <message>
-        <source>Browse</source>
-        <translation>Navegar</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Crear</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>Desa&amp;fío/Respuesta</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Actualizar</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>Archivos llave</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>Todos los archivos</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>Crear un Archivo Llave ....</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>No se puede crear el Archivo Llave:</translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>Seleccione un archivo llave</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Contraseña vacía</translation>
-    </message>
-    <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>¿Realmente desea usar una cadena vacía como contraseña?</translation>
-    </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>Las contraseñas ingresadas son distintas.</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation><numerusform>%n llave(s) movida(s) a datos propios exitosamente.</numerusform><numerusform>%n llave(s) movida(s) a datos propios exitosamente.</numerusform></translation>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>No se pudo establecer %1 como el Archivo llave:
-%2</translation>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation>KeePassXC: ¡No se encontró entrada con los atributos KeePassHTTP!</translation>
     </message>
     <message>
-        <source>Legacy key file format</source>
-        <translation>Formato de archivo llave heredado</translation>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation>La base de datos activa no contiene una entrada con atributos de KeePassHTTP.</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 archivo llave heredado que puede convertirse
- en no soportado en el futuro.
-
-Considere generar un nuevo archivo llave.</translation>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation>KeePassXC: detectada configuración de integración del navegador heredada </translation>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>Falla en el cambio de la clave maestra: no se insertó una llave Yubikey.</translation>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation>Se han detectado configuraciones de integración del navegador heredadas.
+¿Desea actualizar la configuración al último estándar?
+Esto es necesario para mantener la compatibilidad con el complemento del navegador.</translation>
     </message>
 </context>
 <context>
@@ -579,7 +780,7 @@ Considere generar un nuevo archivo llave.</translation>
     </message>
     <message>
         <source>Replace username and password with references</source>
-        <translation>Reemplaza nombre de usuario y contraseña con referencias</translation>
+        <translation>Reemplace nombre de usuario y contraseña con referencias</translation>
     </message>
     <message>
         <source>Copy history</source>
@@ -610,7 +811,7 @@ Considere generar un nuevo archivo llave.</translation>
     </message>
     <message>
         <source>Text is qualified by</source>
-        <translation>Los textos están rodeado por</translation>
+        <translation>Los textos están rodeados por</translation>
     </message>
     <message>
         <source>Fields are separated by</source>
@@ -645,14 +846,6 @@ Considere generar un nuevo archivo llave.</translation>
         <translation>No presente en el archivo CSV</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>Nombre de campo vacío</translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>columna</translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>Importado de un archivo CSV</translation>
     </message>
@@ -661,48 +854,85 @@ Considere generar un nuevo archivo llave.</translation>
         <translation>Dato original:</translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>¡Error(es) detectado(s) en el archivo CSV!</translation>
+        <source>Error</source>
+        <translation>Error</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation>más mensajes salteados]</translation>
+        <source>Empty fieldname %1</source>
+        <translation>Nombre de campo vacío %1</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Error</translation>
+        <source>column %1</source>
+        <translation>columna %1</translation>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>La importación CSV: la escritura tiene errores:
-</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation>¡Error(es) detectado(s) en el archivo CSV!</translation>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>Error</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation><numerusform>[%n más mensaje(s) omitidos]</numerusform><numerusform>[%n más mensaje(s) omitidos]</numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>No se puede calcular la clave maestra</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation>Importación CSV: la escritura tiene errores:
+% 1</translation>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
-        <translation><numerusform>%n byte(s), </numerusform><numerusform>%n byte(s), </numerusform></translation>
+        <source>%n column(s)</source>
+        <translation><numerusform>%n columna(s)</numerusform><numerusform>%n columna(s) </numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation>%1, %2, %3</translation>
     </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
-        <translation><numerusform>%n fila(s), </numerusform><numerusform>%n fila(s), </numerusform></translation>
+        <source>%n byte(s)</source>
+        <translation><numerusform>%n byte(s)</numerusform><numerusform>%n byte(s)</numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
-        <translation><numerusform>%n columna(s)</numerusform><numerusform>%n columna(s) </numerusform></translation>
+        <source>%n row(s)</source>
+        <translation><numerusform>%n fila(s)</numerusform><numerusform>%n fila(s)</numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Raíz</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>El archivo %1 no existe.</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Incapaz de abrir el archivo %1.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation>Error al leer la base de datos: %1</translation>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation>No se pudo guardar, la base de datos no tiene nombre de archivo.</translation>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation>El archivo no se puede escribir, ya que se ha abierto en modo de solo lectura.</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation>Desbloquear Base de Datos - KeePassXC</translation>
     </message>
 </context>
 <context>
@@ -732,14 +962,6 @@ Considere generar un nuevo archivo llave.</translation>
         <translation>Desafío/respuesta:</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>No se pudo abrir la base de datos.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>No se puede abrir el archivo llave</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation>Formato de archivo llave heredado</translation>
     </message>
@@ -769,53 +991,254 @@ Considere generar un nuevo archivo llave.</translation>
         <source>Select key file</source>
         <translation>Seleccionar archivo llave</translation>
     </message>
+    <message>
+        <source>TouchID for quick unlock</source>
+        <translation>TouchID para desbloquear rápidamente</translation>
+    </message>
+    <message>
+        <source>Unable to open the database:
+%1</source>
+        <translation>Incapaz de abrir la base de datos:
+%1</translation>
+    </message>
+    <message>
+        <source>Can't open key file:
+%1</source>
+        <translation>No se puede abrir el archivo llave:
+% 1</translation>
+    </message>
 </context>
 <context>
-    <name>DatabaseRepairWidget</name>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Repair database</source>
-        <translation>Reparar la base de datos</translation>
+        <source>Passwords</source>
+        <translation>Contraseñas</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
     <message>
-        <source>Error</source>
-        <translation>Error</translation>
+        <source>Advanced Settings</source>
+        <translation>Configuraciones avanzadas</translation>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>No se puede abrir el archivo llave</translation>
+        <source>General</source>
+        <translation>General</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>No se pudo abrir la base de datos.</translation>
+        <source>Security</source>
+        <translation>Seguridad</translation>
+    </message>
+    <message>
+        <source>Master Key</source>
+        <translation>Clave Maestra</translation>
+    </message>
+    <message>
+        <source>Encryption Settings</source>
+        <translation>Configuraciones de Cifrado</translation>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation>Integración con Navegadores</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetBrowser</name>
+    <message>
+        <source>KeePassXC-Browser settings</source>
+        <translation>Configuraciones del KeePassXC-Browser</translation>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>&amp;Desconectar todos los navegadores</translation>
+    </message>
+    <message>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation>Olvíd&amp;e todas las configuraciones específicas del sitio en las entradas</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation>Mueva los atributos de KeePassHTTP a los datos &amp;personalizados de KeePassXC-Browser</translation>
+    </message>
+    <message>
+        <source>Stored keys</source>
+        <translation>Claves almacenadas</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Eliminar</translation>
+    </message>
+    <message>
+        <source>Delete the selected key?</source>
+        <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 impedir la conexión con el complemento del navegador.</translation>
+    </message>
+    <message>
+        <source>Key</source>
+        <translation>Clave</translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation>Valor</translation>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation>Habilitar la integración del navegador para acceder a esta configuración.</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Base de datos abierta correctamente. Nada que hacer.</translation>
+        <source>Disconnect all browsers</source>
+        <translation>Desconectar todos los navegadores</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>Éxito</translation>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation>¿Realmente quieres desconectar todos los navegadores?
+Esto puede impedir la conexión con el complemento del navegador.</translation>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>La base de datos ha sido reparada correctamente
-Ahora puede guardarla.</translation>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: No se encontró ninguna clave</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation>No se encontraron claves de cifrado compartidas en la configuración de KeePassXC.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <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>
+        <translation><numerusform>Quitada(s) exitosamente %n llaves de cifrado de la configuración KeePassXC.</numerusform><numerusform>Quitada(s) exitosamente %n llaves de cifrado de la configuración KeePassXC.</numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation>Olvíde todas las configuraciones específicas del sitio en las entradas</translation>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>No se pudo reparar la base de datos.</translation>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation>¿Realmente quieres 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>
+        <translation>Eliminando permisos almacenados...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Abortar</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Permisos eliminados</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation><numerusform>Removidos con éxito permisos de %n entrada(s).</numerusform><numerusform>Removidos con éxito permisos de %n entrada(s).</numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <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 base de datos activa no contiene una entrada con permisos.</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation>Mover los atributos KeePassHTTP a datos personalizados</translation>
+    </message>
+    <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 navegador heredado al último estándar?
+Esto es necesario para mantener la compatibilidad con el complemento del navegador.</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetEncryption</name>
     <message>
-        <source>General</source>
-        <translation>General</translation>
+        <source>Encryption Algorithm:</source>
+        <translation>Algoritmo de cifrado:</translation>
+    </message>
+    <message>
+        <source>AES:  256 Bit   (default)</source>
+        <translation>AES: 256-Bit  (por defecto)</translation>
+    </message>
+    <message>
+        <source>Twofish:  256 Bit</source>
+        <translation>Twofish:  256 Bit</translation>
+    </message>
+    <message>
+        <source>Key Derivation Function:</source>
+        <translation>Función de derivación de la llave:</translation>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation>Rondas de transformación:</translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation>Medición de retraso de un segundo</translation>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation>Memoria utilizada:</translation>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation>Paralelismo:</translation>
+    </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation>Tiempo de Descifrado:</translation>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation>?? s</translation>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation>Cambiar</translation>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation>100 ms</translation>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>Cifrado</translation>
+        <source>5 s</source>
+        <translation>5 s</translation>
+    </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 base de datos llevará más tiempo.</translation>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <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 base de datos con otros programas.</translation>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation>KDBX 4.0 (recomendado)</translation>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation>KDBX 3.1</translation>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation>sin cambios</translation>
     </message>
     <message>
         <source>Number of rounds too high</source>
@@ -869,40 +1292,15 @@ Si conserva este número, ¡su base de datos puede ser muy fácil de descifrar!<
         <comment>Threads for parallel execution (KDF settings)</comment>
         <translation><numerusform>hilo(s)</numerusform><numerusform>hilo(s)</numerusform></translation>
     </message>
-</context>
-<context>
-    <name>DatabaseSettingsWidgetEncryption</name>
-    <message>
-        <source>Encryption Algorithm:</source>
-        <translation>Algoritmo de cifrado:</translation>
-    </message>
-    <message>
-        <source>AES:  256 Bit   (default)</source>
-        <translation>AES: 256-Bit  (por defecto)</translation>
-    </message>
-    <message>
-        <source>Twofish:  256 Bit</source>
-        <translation>Twofish:  256 Bit</translation>
-    </message>
-    <message>
-        <source>Key Derivation Function:</source>
-        <translation>Función de derivación de la llave:</translation>
-    </message>
-    <message>
-        <source>Transform rounds:</source>
-        <translation>Rondas de transformación:</translation>
-    </message>
-    <message>
-        <source>Benchmark 1-second delay</source>
-        <translation>Medición de retraso de un segundo</translation>
-    </message>
-    <message>
-        <source>Memory Usage:</source>
-        <translation>Memoria utilizada:</translation>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation><numerusform>%1 ms</numerusform><numerusform>%1 ms</numerusform></translation>
     </message>
-    <message>
-        <source>Parallelism:</source>
-        <translation>Paralelismo:</translation>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform></translation>
     </message>
 </context>
 <context>
@@ -953,91 +1351,112 @@ Si conserva este número, ¡su base de datos puede ser muy fácil de descifrar!<
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>Raíz</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Base de datos de KeePass 2</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Todos los archivos</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Abrir base de datos</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>¡Archivo no encontrado!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>No se pudo abrir la base de datos.</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>Archivo abierto en modo sólo lectura.</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>Abrir archivo CSV</translation>
+        <source>Add additional protection...</source>
+        <translation>Añadir protección adicional...</translation>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>Archivo CSV</translation>
+        <source>No encryption key added</source>
+        <translation>No se añadió clave de cifrado</translation>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>Todos los archivos (*)</translation>
+        <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 base de datos!</translation>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Unir base de datos</translation>
+        <source>No password set</source>
+        <translation>Sin contraseña establecida</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Abrir base de datos KeePass 1</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 has establecido una contraseña. Se desaconseja el uso de una base de datos sin contraseña.
+
+¿Seguro que quieres continuar sin contraseña?</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>Base de datos KeePass 1</translation>
+        <source>Unknown error</source>
+        <translation>Error desconocido</translation>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>¿Cerrar?</translation>
+        <source>Failed to change master key</source>
+        <translation>Error al cambiar la clave maestra</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;% 1&quot; está en el modo de edición.
-¿Descartar cambios y cerrar de todos modos?</translation>
+        <source>Database Name:</source>
+        <translation>Nombre de la base de datos:</translation>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>¿Guardar cambios?</translation>
+        <source>Description:</source>
+        <translation>Descripción:</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>&quot;%1&quot; ha sido modificado.
-¿Guardar cambios?</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Base de datos de KeePass 2</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Fallo al escribir la base de datos.</translation>
+        <source>All files</source>
+        <translation>Todos los archivos</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Contraseñas</translation>
+        <source>Open database</source>
+        <translation>Abrir base de datos</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Guardar base de datos como</translation>
+        <source>CSV file</source>
+        <translation>Archivo CSV</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>Unir base de datos</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Abrir base de datos KeePass 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>Base de datos KeePass 1</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1048,40 +1467,41 @@ Save changes?</source>
         <translation>La escritura del archivo CSV falló.</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>Nueva base de datos</translation>
+        <source>Database creation error</source>
+        <translation>Error en creación de la base de datos</translation>
     </message>
     <message>
-        <source>locked</source>
-        <translation>bloqueado</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>La base de datos creada no tiene clave o KDF, negándose a guardarla.
+Esto es definitivamente un error, por favor repórtelo a los desarrolladores.</translation>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>Bloquear base de datos</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation>El archivo de base de datos no existe o no es accesible.</translation>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>No se puede bloquear la base de datos porque actualmente está editándola.
-Por favor, pulse cancelar para terminar sus cambios o descartarlos.</translation>
+        <source>Select CSV file</source>
+        <translation>Seleccionar archivo CSV</translation>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>Esta base de datos ha sido modificada.
-¿Desea guardar la base de datos antes de bloquearla?
-De lo contrario se perderán los cambios.</translation>
+        <source>New Database</source>
+        <translation>Nueva Base de datos</translation>
     </message>
     <message>
-        <source>Disable safe saves?</source>
-        <translation>¿Deshabilitar guardados seguros?</translation>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Nueva Base de Datos]</translation>
     </message>
     <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 base de datos varias veces. Esto es probablemente causado por los servicios de sincronización de archivos manteniendo un bloqueo en el archivo.
-¿Desactivar la guarda segura y volver a intentarlo?</translation>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Bloqueada]</translation>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Sólo lectura]</translation>
     </message>
 </context>
 <context>
@@ -1091,40 +1511,16 @@ Disable safe saves and try again?</source>
         <translation>Buscando...</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>Cambiar la clave maestra</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>¿Eliminar la entrada?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>¿Realmente quiere eliminar la entrada &quot;%1&quot; de forma definitiva?</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>¿Eliminar entradas?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>¿Realmente quiere eliminar las entradas &quot;%1&quot; de forma definitiva?</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>¿Mover entrada a la papelera de reciclaje?</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation>¿Realmente quiere mover la entrada &quot;%1&quot; a la papelera de reciclaje?</translation>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>¿Mover entradas 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>¿Estás seguro de mover %n entrada(s) a la papelera de reciclaje?</numerusform><numerusform>¿Estás seguro de mover %n entrada(s) a la papelera de reciclaje?</numerusform></translation>
+        <translation><numerusform>¿Estás seguro de mover %n entrada(s) a la papelera de reciclaje?</numerusform><numerusform>¿Realmente desea mover %n entrada(s) a la papelera de reciclaje?</numerusform></translation>
     </message>
     <message>
         <source>Execute command?</source>
@@ -1139,18 +1535,10 @@ Disable safe saves and try again?</source>
         <translation>Recordar mi elección</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>¿Eliminar grupo?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>¿Realmente quiere eliminar el grupo &quot;%1&quot; de forma definitiva?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>No se puede calcular la clave maestra</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>No hay una base de datos actualmente.</translation>
     </message>
@@ -1184,10 +1572,6 @@ Do you want to merge your changes?</source>
         <translation>El archivo de la base de datos ha cambiado y usted tiene modificaciones sin guardar. ¿Desea unir sus modificaciones?</translation>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>No se pudo abrir el nuevo archivo de la base de datos mientras se intentaba recargar la base de datos actual.</translation>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>¿Vaciar papelera de reciclaje?</translation>
     </message>
@@ -1195,88 +1579,107 @@ Do you want to merge your changes?</source>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>¿Está seguro que quiere eliminar permanentemente todo de su papelera de reciclaje?</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>Generar Token TOTP</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation><numerusform>¿Realmente quiere eliminar %n entrada(s) de forma definitiva?</numerusform><numerusform>¿Realmente quiere eliminar %n entrada(s) de forma definitiva?</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation><numerusform>¿Borrar entrada(s)?</numerusform><numerusform>¿Borrar entrada(s)?</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation><numerusform>¿Mover entrada(s) a la papelera de reciclaje?</numerusform><numerusform>¿Mover entrada(s) a la papelera de reciclaje?</numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Cerrar</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Archivo abierto en modo sólo lectura.</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>General</translation>
+        <source>Lock Database?</source>
+        <translation>¿Bloquear la Base de datos?</translation>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Contraseña</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation>Estás editando una entrada. ¿Descartar los cambios y bloquear todos modos?</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot; ha sido modificado.
+¿Guardar cambios?</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>Vencimiento</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation>Se modificó la base de datos.
+¿Guardar cambios?</translation>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Nombre de usuario:</translation>
+        <source>Save changes?</source>
+        <translation>¿Guardar cambios?</translation>
     </message>
     <message>
-        <source>Autotype</source>
-        <translation>Autoescritura</translation>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation>No se pudo abrir el nuevo archivo de base de datos al intentar cargar automáticamente.
+Error: %1</translation>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>Buscando...</translation>
+        <source>Disable safe saves?</source>
+        <translation>¿Deshabilitar guardados seguros?</translation>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>Atributos</translation>
+        <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 base de datos varias veces. Esto es probablemente causado por los servicios de sincronización de archivos manteniendo un bloqueo en el archivo.
+¿Desactivar la guarda segura y volver a intentarlo?</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Adjuntos</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation>Fallo al escribir en la base de datos.
+%1</translation>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Notas</translation>
+        <source>Passwords</source>
+        <translation>Contraseñas</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>Ventana</translation>
+        <source>Save database as</source>
+        <translation>Guardar base de datos como</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>Secuencia</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Base de datos de KeePass 2</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Buscar</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Limpiar</translation>
+        <source>Delete group</source>
+        <translation>Eliminar grupo</translation>
     </message>
     <message>
-        <source>Never</source>
-        <translation>Nunca</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[PROTEGIDO]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>Deshabilitado</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Habilitado</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1350,22 +1753,10 @@ Do you want to merge your changes?</source>
         <translation>Nuevo atributo</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Confirmar eliminación</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>¿Está seguro que desea eliminar este atributo?</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[PROTEGIDO]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation>Presione revelar para ver o editar</translation>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>Mañana</translation>
     </message>
@@ -1378,10 +1769,6 @@ Do you want to merge your changes?</source>
         <translation><numerusform>%n mes(es)</numerusform><numerusform>%n mes(es)</numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 año</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation>¿Aplicar contraseña generada?</translation>
     </message>
@@ -1393,6 +1780,26 @@ Do you want to merge your changes?</source>
         <source>Entry updated successfully.</source>
         <translation>Entrada actualizada.</translation>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation>La entrada tiene cambios sin guardar</translation>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation>Nuevo atributo %1</translation>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation>[PROTEGIDO] Presione revelar para ver o editar</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n año(s)</numerusform><numerusform>%n año(s)</numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1638,6 +2045,81 @@ Do you want to merge your changes?</source>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>Forma</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Contraseña:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1695,10 +2177,6 @@ Do you want to merge your changes?</source>
         <translation>No se pudo descargar el favicon</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Consejo: Puede activar Google como una alternativa en Herramientas &gt; Configuración &gt; Seguridad</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>Imágenes</translation>
     </message>
@@ -1707,14 +2185,6 @@ Do you want to merge your changes?</source>
         <translation>Todos los archivos</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Seleccionar imagen</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read icon</source>
-        <translation>No se puede leer el ícono</translation>
-    </message>
-    <message>
         <source>Custom icon already exists</source>
         <translation>El icono personalizado ya existe</translation>
     </message>
@@ -1723,8 +2193,36 @@ Do you want to merge your changes?</source>
         <translation>Confirmar Eliminación</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>Este ícono se utiliza en %1 entradas, y será modificado por el ícono por defecto. ¿Está seguro que desea eliminarlo?</translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation>Icono personalizado descargado exitosamente</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>Sugerencia: puede habilitar DuckDuckGo como una alternativa en Herramientas&gt; Configuración&gt; Seguridad</translation>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation>Seleccionar imagen(es)</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation><numerusform>Cargado(s) %1 de %n ícono(s) exitosamente</numerusform><numerusform>Cargado(s) %1 de %n ícono(s) exitosamente</numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation>No se cargaron los iconos</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation><numerusform>El/Los ícono(s) %n ya existe(n) en la base de datos</numerusform><numerusform>El/Los ícono(s) %n ya existe(n) en la base de datos</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation><numerusform>El/Los siguiente(s) ícono(s) fallaron:</numerusform><numerusform>El/Los siguiente(s) ícono(s) fallaron:</numerusform></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 ícono es usado en %1 entrada(s), y será remplazado por el ícono por defecto. ¿Está seguro que desea eliminarlo?</numerusform><numerusform>Este ícono es usado en %1 entrada(s), y será remplazado por el ícono por defecto. ¿Está seguro que desea eliminarlo?</numerusform></translation>
     </message>
 </context>
 <context>
@@ -1755,7 +2253,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Delete plugin data?</source>
-        <translation>Eliminar los datos del plugin?</translation>
+        <translation>¿Eliminar los datos del complemento?</translation>
     </message>
     <message>
         <source>Do you really want to delete the selected plugin data?
@@ -1775,9 +2273,8 @@ Esto puede causar un mal funcionamiento de los complementos afectados.</translat
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation>- Clon</translation>
+        <source>%1 - Clone</source>
+        <translation>%1 - Clonar</translation>
     </message>
 </context>
 <context>
@@ -1819,11 +2316,7 @@ Esto puede causar un mal funcionamiento de los complementos afectados.</translat
     </message>
     <message numerus="yes">
         <source>Are you sure you want to remove %n attachment(s)?</source>
-        <translation><numerusform>¿Confirma que desea quitar %n dato(s) adjunto(s)?</numerusform><numerusform>¿Confirma que desea quitar %n dato(s) adjunto(s)?</numerusform></translation>
-    </message>
-    <message>
-        <source>Confirm Remove</source>
-        <translation>Confirmar eliminación</translation>
+        <translation><numerusform>¿Confirma que desea quitar %n dato(s) adjunto(s)?</numerusform><numerusform>¿Confirme que desea remover %n dato(s) adjunto(s)?</numerusform></translation>
     </message>
     <message>
         <source>Save attachments</source>
@@ -1837,7 +2330,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>¿Seguro que quieres sobrescribir el archivo existente &quot;%1&quot; con el archivo adjunto?</translation>
+        <translation>¿Está seguro que quiere sobrescribir el archivo existente &quot;%1&quot; con el archivo adjunto?</translation>
     </message>
     <message>
         <source>Confirm overwrite</source>
@@ -1862,10 +2355,13 @@ Esto puede causar un mal funcionamiento de los complementos afectados.</translat
 %1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation>Confirmar eliminación</translation>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>No se pueden abrir los archivos:
-%1</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1949,6 +2445,106 @@ Esto puede causar un mal funcionamiento de los complementos afectados.</translat
         <source>Attachments</source>
         <translation>Adjuntos</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>Si</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>Generar Token TOTP</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Cerrar</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Nombre de usuario:</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Contraseña</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Vencimiento</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>Atributos</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Adjuntos</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notas</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Autoescritura</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Ventana</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Secuencia</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Buscando...</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Buscar</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Limpiar</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Nunca</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[PROTEGIDO]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Habilitado</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Deshabilitado</translation>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EntryView</name>
@@ -1987,6 +2583,19 @@ Esto puede causar un mal funcionamiento de los complementos afectados.</translat
         <source>Recycle Bin</source>
         <translation>Papelera de reciclaje</translation>
     </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation>[vacío]</translation>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>HostInstaller</name>
@@ -2000,61 +2609,6 @@ Esto puede causar un mal funcionamiento de los complementos afectados.</translat
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>Longitud:</translation>
-    </message>
-    <message>
-        <source>Character Types</source>
-        <translation>Tipos de caracteres</translation>
-    </message>
-    <message>
-        <source>Upper Case Letters</source>
-        <translation>Letras mayúsculas</translation>
-    </message>
-    <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
-    </message>
-    <message>
-        <source>Lower Case Letters</source>
-        <translation>Letras minúsculas</translation>
-    </message>
-    <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
-    </message>
-    <message>
-        <source>Numbers</source>
-        <translation>Números</translation>
-    </message>
-    <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
-    </message>
-    <message>
-        <source>Special Characters</source>
-        <translation>Caracteres especiales</translation>
-    </message>
-    <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
-    </message>
-    <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Excluir caracteres similares</translation>
-    </message>
-    <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>Asegurar que la contraseña contiene caracteres de todos los grupos</translation>
-    </message>
-    <message>
-        <source>Extended ASCII</source>
-        <translation>ASCII Extendido</translation>
-    </message>
-</context>
-<context>
     <name>KMessageWidget</name>
     <message>
         <source>&amp;Close</source>
@@ -2079,6 +2633,26 @@ Esto puede causar un mal funcionamiento de los complementos afectados.</translat
         <source>Wrong key or database file is corrupt.</source>
         <translation>La contraseña es incorrecta o el archivo de la base de datos está dañado.</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation>faltan las cabeceras de la base de datos</translation>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation>La cabecera no coincide con el hash</translation>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>Tamaño id de la cabecera inválido</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>Longitud del campo en la cabecera inválido</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>Longitud del campo de datos en la cabecera incorrecto</translation>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2238,10 +2812,6 @@ Esto puede causar un mal funcionamiento de los complementos afectados.</translat
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation>Largo uuid de cifrado inválido</translation>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation>Cifrado no compatible</translation>
     </message>
@@ -2293,7 +2863,19 @@ Esta migración es en único sentido. No podrá abrir la base de datos importada
     </message>
     <message>
         <source>Unsupported KeePass 2 database version.</source>
-        <translation>Version de la base de datos de KeePass 2 no soportada.</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>
+        <translation>Longitud de uuid de cifrado no válida: %1 (longitud =%2)</translation>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation>No se puede analizar UUID: %1</translation>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2367,10 +2949,6 @@ Esta migración es en único sentido. No podrá abrir la base de datos importada
         <translation>Elemento del historial con uuid diferente</translation>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation>No se puede descifrar la cadena de entrada</translation>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation>Atributo personalizado duplicado encontrado</translation>
     </message>
@@ -2419,6 +2997,14 @@ Esta migración es en único sentido. No podrá abrir la base de datos importada
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation>No se puede descomprimir binario</translation>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation>Error XML:
+%1
+Linea %2, columna %3</translation>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2582,28 +3168,130 @@ Esta migración es en único sentido. No podrá abrir la base de datos importada
         <source>Invalid entry field type</source>
         <translation>Tipo de la entrada para el campo inválido</translation>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation>incapaz de buscar la posición de contenido</translation>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>El archivo de bloqueo de instancia única existente no es válido. Lanzando nueva instancia.</translation>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>El archivo de bloqueo no pudo ser creado. Modo de instancia única deshabilitado.</translation>
+        <source>Import from</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Otra instancia de KeePassXC ya se está ejecutando.</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Error fatal comprobando las funciones criptográficas.</translation>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Error</translation>
+        <source>Key Component</source>
+        <translation>Componente de la Clave</translation>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation>Descripción del componente de la Clave</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation>Conjunto de componentes de la Clave, haga clic para cambiar o eliminar</translation>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation>Añadir %1</translation>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation>Cambiar %1</translation>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation>Eliminar %1</translation>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation>%1 conjunto, haga clic para cambiar o eliminar</translation>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>Navegar</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Generar</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation>Fichero de claves</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>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation>Formato de archivo llave 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
+sin soporte en el futuro.
+
+Vaya a la configuración de la clave maestra y genere un nuevo fichero de claves.</translation>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation>Error al cargar el fichero de claves &apos;%1&apos;
+Mensaje: %2</translation>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Archivos llave</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Todos los archivos</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Crear un Archivo Llave ....</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation>Error al crear el fichero de claves</translation>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation>No se puede crear el fichero de claves: %1</translation>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Seleccione un archivo llave</translation>
     </message>
 </context>
 <context>
@@ -2617,10 +3305,6 @@ Esta migración es en único sentido. No podrá abrir la base de datos importada
         <translation>Bases de datos &amp;recientes</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Importar</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation>&amp;Ayuda</translation>
     </message>
@@ -2629,14 +3313,6 @@ Esta migración es en único sentido. No podrá abrir la base de datos importada
         <translation>E&amp;ntradas</translation>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>Copiar at&amp;ributo al portapapeles</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation>Contraseña temporal de un solo uso</translation>
-    </message>
-    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Grupos</translation>
     </message>
@@ -2665,30 +3341,10 @@ Esta migración es en único sentido. No podrá abrir la base de datos importada
         <translation>&amp;Cerrar base de datos</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>&amp;Nueva base de datos</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>Unir base de datos KeePassX</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>&amp;Añadir nueva entrada</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>&amp;Ver/Editar entrada</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>&amp;Eliminar entrada</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>&amp;Añadir nuevo grupo</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>&amp;Editar grupo</translation>
     </message>
@@ -2701,14 +3357,6 @@ Esta migración es en único sentido. No podrá abrir la base de datos importada
         <translation>&amp;Guardar base de datos como...</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Cambiar la clave &amp;maestra...</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>Configuración de la base de &amp;datos</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>Configuración de la base de datos</translation>
     </message>
@@ -2717,10 +3365,6 @@ Esta migración es en único sentido. No podrá abrir la base de datos importada
         <translation>&amp;Clonar entrada</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>&amp;Buscar</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>Copiar nombre de &amp;usuario</translation>
     </message>
@@ -2729,10 +3373,6 @@ Esta migración es en único sentido. No podrá abrir la base de datos importada
         <translation>Copiar nombre de usuario al portapapeles</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>Cop&amp;iar contraseña</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>Copiar contraseña al portapapeles</translation>
     </message>
@@ -2745,14 +3385,6 @@ Esta migración es en único sentido. No podrá abrir la base de datos importada
         <translation>Generador de contraseñas</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation>Realizar Auto-&amp;Escritura</translation>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>A&amp;brir URL</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>&amp;Bloquear las bases de datos</translation>
     </message>
@@ -2785,22 +3417,6 @@ Esta migración es en único sentido. No podrá abrir la base de datos importada
         <translation>&amp;Exportar a un archivo CSV...</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Importat base de datos KeePass 1...</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>Importar archivo CSV...</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>&amp;Reparar base de datos...</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>Mostrar TOTP</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>Configurar TOTP...</translation>
     </message>
@@ -2821,14 +3437,6 @@ Esta migración es en único sentido. No podrá abrir la base de datos importada
         <translation>Error de acceso al archivo de configuración %1</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Parece que utiliza KeePassHTTP para la integración del navegador. Esta característica ha quedado obsoleto y desaparecerá en el futuro. &lt;br&gt;Por favor, ¡pasa a KeePassXC-Browser en lugar de esto! Para obtener ayuda con la migración, visite nuestra &lt;a class=&quot;link&quot; href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;Guía de migración&lt;/a&gt; (advertencia %1 de 3).&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>sólo lectura</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Configuración</translation>
     </message>
@@ -2841,36 +3449,278 @@ Esta migración es en único sentido. No podrá abrir la base de datos importada
         <translation>Salir de KeePassXC</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Base de datos de KeePass 2</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Por favor presione el botón en su YubiKey!</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Todos los archivos</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation>ADVERTENCIA: Usted está utilizando una versión inestable de KeePassXC!
+Hay un alto riesgo de corrupción, mantenga una copia de seguridad de sus bases de datos.
+Esta versión no es para uso de producción.</translation>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Abrir base de datos</translation>
+        <source>&amp;Donate</source>
+        <translation>&amp;Donar</translation>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Guardar base de datos reparada</translation>
+        <source>Report a &amp;bug</source>
+        <translation>Reportar un &amp;error</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Fallo al escribir la base de datos.</translation>
+        <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>ADVERTENCIA: ¡Su versión de Qt puede hacer que KeePassXC se bloquee con un teclado virtual!
+Le recomendamos que utilice la AppImage disponible en nuestra página de descargas.</translation>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Por favor presione el botón en su YubiKey!</translation>
+        <source>&amp;Import</source>
+        <translation>&amp;Importar</translation>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
-        <translation>ADVERTENCIA: Usted está utilizando una versión inestable de KeePassXC!
-Hay un alto riesgo de corrupción, mantenga una copia de seguridad de sus bases de datos.
-Esta versión no es para uso de producción.</translation>
+        <source>Copy att&amp;ribute...</source>
+        <translation>Copiar at&amp;ributo...</translation>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation>TOTP...</translation>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation>&amp;Nueva base de datos...</translation>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation>Crear una nueva base de datos</translation>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation>&amp;Unir desde la base de datos...</translation>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation>Unir desde otra base de datos KDBX</translation>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation>&amp;Nueva entrada</translation>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation>Añadir una nueva entrada</translation>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation>&amp;Editar entrada</translation>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation>Ver o editar entrada</translation>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation>&amp;Nuevo grupo</translation>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation>Añadir un nuevo grupo</translation>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation>Cambiar la clave &amp;maestra...</translation>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation>Configuración de la base de &amp;datos</translation>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation>Copiar &amp;contraseña</translation>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation>Relizar &amp;Auto-Escritura</translation>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation>Abrir &amp;URL</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation>Base de datos KeePass 1...</translation>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation>Importar una base de datos KeePass 1</translation>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation>Archivo CSV...</translation>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation>Importar un archivo CSV</translation>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation>Mostrar TOTP...</translation>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation>Mostrar código QR TOTP...</translation>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation>Creando %1 faltante [%2]</translation>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation>Reubicando %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation>Sobrescribiendo %1 [%2]</translation>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation>la entrada más antigua se fusionó a la base de datos &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation>Agregando copia de seguridad para el destino más antiguo %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation>Agregando copia de seguridad para la fuente anterior %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation>Volver a aplicar una entrada de destino más antigua sobre la fuente 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 una entrada de origen anterior sobre el objetivo más nuevo %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation>Sincronización desde una fuente más nueva %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation>Sincronización desde una fuente anterior %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation>Borrando hijo %1[%2]</translation>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation>Eliminando huérfano %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation>cambiado objetos eliminados</translation>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation>Añadiendo el icono faltante %1</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation>Crear una nueva base de datos KeePassXC ...</translation>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Raíz</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>PáginaAsistente</translation>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation>Configuraciones de &amp;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 base de datos. No se preocupe, puede cambiarlos más adelante en la configuración de la base de datos.</translation>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Configuraciones avanzadas</translation>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation>Ajustes simples</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <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 base de datos. No se preocupe, puede cambiarlos 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>Llave maestra de la base de datos</translation>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation>Una llave maestra, conocida por usted únicamente, protege su base de datos.</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <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>Por favor complete el nombre, y agregue una descripción opcional, para su nueva base de datos:</translation>
     </message>
 </context>
 <context>
@@ -2973,125 +3823,34 @@ Esta versión no es para uso de producción.</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation>Cuadro de diálogo</translation>
-    </message>
-    <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>Esto se requiere para acceder a sus bases de datos desde ChromeIPass o PassIFox</translation>
-    </message>
-    <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>Habilitar el servidor de KeePassHTTP</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>General</translation>
-    </message>
-    <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>M&amp;ostrar una notificación cuando se pidan credenciales</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 entradas para todo el dominio.</translation>
-    </message>
-    <message>
-        <source>&amp;Return only best matching entries</source>
-        <translation>&amp;Devolver sólo las entradas más relevantes</translation>
-    </message>
-    <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <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://, ftp://, ...) are returned.</source>
-        <translation>Sólo se devuelven las entradas con el mismo esquema (http://, https://, ftp://, ...)</translation>
-    </message>
-    <message>
-        <source>&amp;Match URL schemes</source>
-        <translation>&amp;Validar los esquemas de las URL</translation>
-    </message>
-    <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Ordenar entradas por nombre de &amp;usuario</translation>
-    </message>
-    <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Ordenar entradas por &amp;título</translation>
-    </message>
-    <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>&amp;Eliminar todas las claves de cifrado compartidas de la base de datos activa</translation>
-    </message>
-    <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>Eli&amp;minar todos los permisos guardados de las entradas de la base de datos activa</translation>
-    </message>
-    <message>
-        <source>Password Generator</source>
-        <translation>Generador de contraseñas</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Avanzado</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Siempre permitir &amp;acceso a las entradas</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Siempre permitir act&amp;ualizaciones de las entradas</translation>
-    </message>
-    <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>Sólo las bases de datos seleccionadas se conectaran con el cliente.</translation>
-    </message>
-    <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Busca&amp;r entradas que coincidan en todas las bases de datos abiertas</translation>
-    </message>
-    <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>No se permite crear o actualizar campos de caracteres automáticamente.</translation>
-    </message>
-    <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>Mostra&amp;r campos de caracteres avanzados que comiencen con &quot;KPH: &quot;</translation>
-    </message>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>HTTP Port:</source>
-        <translation>Puerto HTTP:</translation>
+        <source>Enter password:</source>
+        <translation>Ingrese la contraseña</translation>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Puerto por defecto: 19455</translation>
+        <source>Confirm password:</source>
+        <translation>Confirme la contraseña</translation>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC escuchará por este puerto en 127.0.0.1</translation>
+        <source>Password</source>
+        <translation>Contraseña</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;Advertencia:&lt;/b&gt; Las siguientes opciones pueden ser peligrosas.</translation>
+        <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 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>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;KeePassHTTP ha quedado obsoleto y desaparecerá en el futuro. &lt;br&gt;Por favor, ¡pasa a KeePassXC-Browser en lugar de esto! Para obtener ayuda con la migración, visite nuestra &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;Guía de migración&lt;/a&gt;.&lt;/p&gt;</translation>
+        <source>Password cannot be empty.</source>
+        <translation>La contraseña no puede ser vacía.</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>No se puede asociar a puertos con privilegios</translation>
+        <source>Passwords do not match.</source>
+        <translation>Las contraseñas no coinciden.</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>¡No se puede asociar a puertos con privilegios debajo de 1024!
-Usando el puerto por defecto 19455</translation>
+        <source>Generate master password</source>
+        <translation>Generar contraseña maestra</translation>
     </message>
 </context>
 <context>
@@ -3162,18 +3921,10 @@ Usando el puerto por defecto 19455</translation>
         <translation>Lista de palabras:</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Cantidad de Palabras:</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>Separador de Palabras:</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>Generar</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
@@ -3186,10 +3937,6 @@ Usando el puerto por defecto 19455</translation>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>Aplicar</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>Entropía: %1 bit</translation>
     </message>
@@ -3217,6 +3964,171 @@ Usando el puerto por defecto 19455</translation>
         <comment>Password quality</comment>
         <translation>Excelente</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation>ASCII extendido</translation>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation>Cambiar a modo avanzado</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Avanzado</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation>Letras mayúsculas de la A hasta la F</translation>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation>Letras minúsculas de la A hasta la F</translation>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation>Llaves</translation>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation>{[(</translation>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation>Puntuación</translation>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation>.,:;</translation>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation>Comillas</translation>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation>&quot; &apos;</translation>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation>Matemáticas</translation>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation>&lt;*+!? =</translation>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation>Guiones</translation>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation>\_|-/</translation>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation>Logogramas</translation>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation>#$%&amp;&amp;@^`~</translation>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation>Cambiar a modo sencillo</translation>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation>Sencillo</translation>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation>Conjunto de caracteres a excluir de la contraseña generada</translation>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation>No incluir:</translation>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation>Agregar letras no-hexadecimales a la lista de &quot;no incluir&quot;</translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation>Hexadecimal</translation>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation>Caracteres excluidos: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</translation>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation>C&amp;uenta de palabras:</translation>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation>Regenerar</translation>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Eliminar</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Eliminar</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Deshabilitar</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3237,34 +4149,18 @@ Usando el puerto por defecto 19455</translation>
         <translation>No se puede descifrar el mensaje</translation>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
-        <translation>Tiempo de espera superado, o no se puede conectar a KeePassXC</translation>
-    </message>
-    <message>
         <source>Action cancelled or denied</source>
         <translation>Acción cancelada o denegada</translation>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation>No se puede cifrar el mensaje o la clave pública no se encuentra. ¿Es habilitado el Native Messaging en KeePassXC?</translation>
-    </message>
-    <message>
         <source>KeePassXC association failed, try again</source>
         <translation>No se pudo asociar con KeePassXC, inténtelo de nuevo</translation>
     </message>
     <message>
-        <source>Key change was not successful</source>
-        <translation>Cambio de clave no fue exitoso</translation>
-    </message>
-    <message>
         <source>Encryption key is not recognized</source>
         <translation>Clave de cifrado no es reconocida</translation>
     </message>
     <message>
-        <source>No saved databases found</source>
-        <translation>Ninguna base de datos guardadas encontrada</translation>
-    </message>
-    <message>
         <source>Incorrect action</source>
         <translation>Acción incorrecta</translation>
     </message>
@@ -3390,10 +4286,6 @@ Usando el puerto por defecto 19455</translation>
         <translation>Introduzca la contraseña para desbloquear %1: </translation>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation>Error al cargar el archivo llave %1 : %2</translation>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3478,12 +4370,6 @@ Comandos disponibles:
         <translation>error leyendo del dispositivo</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>¡archivo vacío!
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation>cadena de caracteres mal formada</translation>
     </message>
@@ -3492,30 +4378,6 @@ Comandos disponibles:
         <translation>comilla de cierre faltante</translation>
     </message>
     <message>
-        <source>AES: 256-bit</source>
-        <translation>AES: 256-bit</translation>
-    </message>
-    <message>
-        <source>Twofish: 256-bit</source>
-        <translation>Twofish: 256-bit</translation>
-    </message>
-    <message>
-        <source>ChaCha20: 256-bit</source>
-        <translation>ChaCha20: 256-bit</translation>
-    </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – recomendado)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 4)</source>
-        <translation>AES-KDF (KDBX 4)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 3.1)</source>
-        <translation>AES-KDF (KDBX 3.1)</translation>
-    </message>
-    <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
@@ -3544,10 +4406,6 @@ Comandos disponibles:
         <translation>Creado</translation>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
-        <translation>Integración de navegador obsoleta</translation>
-    </message>
-    <message>
         <source>Browser Integration</source>
         <translation>Integración con Navegadores</translation>
     </message>
@@ -3576,10 +4434,6 @@ Comandos disponibles:
         <translation>Número de palabras para la frase de contraseña de diceware.</translation>
     </message>
     <message>
-        <source>count</source>
-        <translation>número</translation>
-    </message>
-    <message>
         <source>Wordlist for the diceware generator.
 [Default: EFF English]</source>
         <translation>Lista de palabras para el generador de diceware.
@@ -3590,28 +4444,441 @@ Comandos disponibles:
         <translation>Generar una nueva contraseña aleatoria.</translation>
     </message>
     <message>
-        <source>Length of the generated password.</source>
-        <translation>Longitud de la contraseña generada.</translation>
+        <source>Invalid value for password length %1.</source>
+        <translation>Valor inválido para el largo de contraseña %1.</translation>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation>No pudo crearse la entrada con ruta %1.</translation>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation>Ingrese la contraseña para la nueva entrada:</translation>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation>Falló escritura de la base de datos %1.</translation>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation>La entrada se agregó exitosamente %1.</translation>
+    </message>
+    <message>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation>Copiar el TOTP actual al portapapeles.</translation>
+    </message>
+    <message>
+        <source>Invalid timeout value %1.</source>
+        <translation>Valor inválido para el &quot;timeout&quot; %1.</translation>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation>No se encontró la entrada %1.</translation>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <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 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 de la entrada actual se ha copiado al portapapeles!</translation>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation><numerusform>Limpiar el portapapeles en %1 segundo(s)...</numerusform><numerusform>Limpiar el portapapeles en %1 segundo(s)...</numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation>¡El portapapeles se ha limpiado!</translation>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation>Silenciar la solicitud de contraseña y demás productos secundarios.</translation>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation>número</translation>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation>Valor inválido para el largo de contraseña: %1</translation>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <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 entrada de 1%.</translation>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation>Introduzca una nueva contraseña para la entrada:</translation>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation>Fallo al escribir la base de datos: %1</translation>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation>Entrada %1 editada exitosamente.</translation>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation>Longitud %1</translation>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation>Entropía: %1</translation>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation>Log10 %1</translation>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation>Multi-palabra extra bits %1</translation>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation>Tipo: Fuerza Bruta</translation>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation>Tipo: Diccionario</translation>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation>Tipo: Dicc+Leet</translation>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation>Tipo: Usuario Palabras</translation>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation>Tipo: Usuario+Leet</translation>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation>Type: Repetido</translation>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation>Tipo: Secuencia</translation>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation>Tipo: Espacial</translation>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation>Tipo: Fecha</translation>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation>Tipo: Fuerza Bruta(Rep)</translation>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
-        <translation>Usar caracteres en minúsculas en la contraseña generada.</translation>
+        <source>Type: Dictionary(Rep)</source>
+        <translation>Tipo: Diccionario(Rep)</translation>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
-        <translation>Usar caracteres en mayúsculas en la contraseña generada.</translation>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation>Tipo: Dicc+Leet(Rep)</translation>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
-        <translation>Usar números en la contraseña generada.</translation>
+        <source>Type: User Words(Rep)</source>
+        <translation>Tipo: Usuario Palabras(Rep)</translation>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
-        <translation>Usar caracteres especiales en la contraseña generada.</translation>
+        <source>Type: User+Leet(Rep)</source>
+        <translation>Tipo: Usuario + Leet(Rep)</translation>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
-        <translation>Usar ASCII extendido en la contraseña generada.</translation>
+        <source>Type: Repeated(Rep)</source>
+        <translation>Tipo: Repetido(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation>Tipo: Secuencia(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation>Tipo: Espacial(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation>Tipo: Fecha(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation>Tipo: Desconocido %1</translation>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation>Entropía %1 (%2)</translation>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation>*** Longitud de la contraseña (%1) != Suma de la longitud de las partes (%2) ***</translation>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation>Error al cargar el fichero de claves %1: %2</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>El archivo %1 no existe.</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Incapaz de abrir el archivo %1.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation>Error al leer la base de datos:
+%1</translation>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation>Error al analizar la base de datos:
+%1</translation>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation>Longitud de la contraseña generada</translation>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation>Usar caracteres en minúscula</translation>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation>Usar caracteres en mayúscula</translation>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation>Usar números.</translation>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation>Usar caracteres especiales</translation>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation>Usar ASCII extendido</translation>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation>Excluir conjunto de caracteres</translation>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation>caracteres</translation>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation>Excluir caracteres de aspecto similar</translation>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation>Incluir caracteres de cada grupo seleccionado</translation>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation>Listar recursivamente los elementos del grupo.</translation>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation>No se puede encontrar el grupo %1.</translation>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation>Error al leer el archivo a unir:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <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 base de datos en el archivo: %1</translation>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation>Entrada %1 reciclada exitosamente.</translation>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation>Se eliminó correctamente la entrada %1.</translation>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation>Muestra la entrada actual del TOTP.</translation>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation>ERROR: atributo desconocido %1.</translation>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation>Ningún programa definido para la manipulación del portapapeles.</translation>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation>No se puede iniciar el programa %1</translation>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation>archivo vacío</translation>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation>%1: (fila, col) %2,%3</translation>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256-bit</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256-bit</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256-bit</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – recomendado)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation>Configuración inválida</translation>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation>Clave Inválida</translation>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>Quitar una entrada de la base de datos.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>Camino de la entrada a quitar.</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <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 archivo de bloqueo no pudo ser creado. Modo de instancia única deshabilitado.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - gestor de claves multiplataforma</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <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 archivo de configuración personalizado</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>archivo llave de la base de datos</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>leer contraseña de la base de datos desde la entrada estándar</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation>Identificador de la ventana padre</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Otra instancia de KeePassXC ya se está ejecutando.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Error fatal comprobando las funciones criptográficas.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Error</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation>Contraseña de la Base de Datos:</translation>
     </message>
 </context>
 <context>
@@ -3649,12 +4916,98 @@ Comandos disponibles:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
+    <message>
+        <source>Agent connection failed.</source>
+        <translation>La conexión del agente falló.</translation>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation>Error de protocolo del agente.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation>Ningún agente en ejecución, no se puede agregar identidad.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation>Ningún agente en ejecución, no puede eliminar identidad.</translation>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation>El agente rechazó esta identidad. Las posibles razones incluyen:</translation>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation>La clave ya ha sido añadida.</translation>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation>La vida útil limitada no es soportada por el agente (verifique opciones).</translation>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation>La solicitud de confirmación no es soportada por el agente (verifique opciones).</translation>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation>Buscar Ayuda</translation>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation>Los términos de búsqueda son los siguientes: [modificadores] [campo:] [&quot;] término [&quot;]</translation>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation>Cada término de búsqueda debe coincidir (es decir, AND lógico)</translation>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation>Modificadores</translation>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation>excluir término de resultados</translation>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation>coincidencia en término exactamente</translation>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation>usar expresiones regulares en término</translation>
+    </message>
     <message>
-        <source>Search...</source>
-        <translation>Buscar...</translation>
+        <source>Fields</source>
+        <translation>Campos</translation>
     </message>
     <message>
+        <source>Term Wildcards</source>
+        <translation>Comodines en término</translation>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation>coincidir cualquier cosa</translation>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation>coincidir uno</translation>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation>OR lógico</translation>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation>Ejemplos</translation>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
         <source>Search</source>
         <translation>Buscar</translation>
     </message>
@@ -3663,314 +5016,316 @@ Comandos disponibles:
         <translation>Limpiar</translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Distinguir mayúsculas/minúsculas</translation>
-    </message>
-    <message>
         <source>Limit search to selected group</source>
         <translation>Limitar la búsqueda al grupo selecionado</translation>
     </message>
+    <message>
+        <source>Search Help</source>
+        <translation>Buscar Ayuda</translation>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation>Buscar (%1) ...</translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation>Distinguir mayúsculas/minúsculas</translation>
+    </message>
 </context>
 <context>
-    <name>Service</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC: Solicitud de asociación de nueva clave</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation>Has recibido una solicitud de asociación para la clave de arriba.
-Si desea permitir su acceso a su base de datos KeePassXC
-asigne un nombre único para identificarla y acepte.</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: ¿Sobrescribir clave existente?</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Ya existe una clave de cifrado con el nombre %1.
-¿Desea sobrescribirla?</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: Actualizar entrada</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>¿Desea actualizar la información en %1 - %2?</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: ¡Base de datos bloqueada!</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>¡La base de datos activa está bloqueada!
-Por favor desbloquee la base de datos seleccionada o elija otra que esté desbloqueada.</translation>
+        <source>Key:</source>
+        <translation>Clave:</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Las claves se eliminaron de la base de datos</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation><numerusform>Quitado con éxito %n llave(s) de cifrado de la configuración de KeePassXC/Http.</numerusform><numerusform>Quitado con éxito %n llave(s) de cifrado de la configuración de KeePassXC/Http.</numerusform></translation>
+        <source>Generate</source>
+        <translation>Generar</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: No se encontró ninguna clave</translation>
+        <source>Import</source>
+        <translation>Importar</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>No se encontraron claves de cifrado en la configuración de KeePassHttp.</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: ¡Configuraciones no disponibles!</translation>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>La base de datos activa no contiene una entrada de configuración de KeePassHttp.</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>Eliminando los permisos guardados...</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>Abortar</translation>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Permisos eliminados</translation>
+        <source>Remove</source>
+        <translation>Eliminar</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation><numerusform>Los permisos fueron eliminados exitosamente de %n entradas.</numerusform><numerusform>Los permisos fueron eliminados exitosamente de %n entradas.</numerusform></translation>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: ¡No se encontró ninguna entrada con permisos!</translation>
+        <source>Status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>La base de datos activa no contiene una entrada con permisos.</translation>
+        <source>Fingerprint</source>
+        <translation>Huella dactilar</translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
-        <translation>Configuración de la aplicación</translation>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>General</translation>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>Seguridad</translation>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>Error de acceso al archivo de configuración %1</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>Configuraciones Básicas</translation>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Inicie sólo una instancia de KeePassXC</translation>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>Recordar última base de datos</translation>
+        <source>All files</source>
+        <translation>Todos los archivos</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Recordar los últimos archivos de llaves y el dongle de seguridad</translation>
+        <source>Select path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Abrir base de datos anterior al inicio</translation>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>Guardar automáticamente al salir</translation>
+        <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"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>Guardar automáticamente después de cada cambio</translation>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Recargar automáticamente la base de datos cuando sea modificada externamente</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>Minimizar al copiar al portapapeles</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Minimizar la ventana al iniciar</translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>Usar icono del grupo en la creación de entrada</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>No marcar la base de datos como modificada cuando los cambios no afecten a los datos (ej. expandir grupos)</translation>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
-        <translation>Ocultar la vista de detalles</translation>
+        <source>Never</source>
+        <translation>Nunca</translation>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>Mostrar icono en la bandeja de del sistema</translation>
+        <source>Always</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>Ocultar la ventana a la bandeja del sistema cuando se minimiza</translation>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
-        <translation>Ocultar la ventana a la bandeja del sistema en vez de cerrar</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
-        <translation>Icono de bandeja del sistema oscuro</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Idioma</translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Auto-Escritura</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>Use título de entrada para acertar ventanas en Auto-Tipeado</translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>Use URL para acertar ventanas en Auto-Tipedo global</translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation>Siempre preguntar antes de hacer Auto-Escritura</translation>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Atajo global de Auto-Escritura</translation>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>Retardo de Auto-Escritura</translation>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation>Micro segundo</translation>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
-        <translation>Inicio</translation>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
-        <translation>Administración de archivos</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation>Guardar los archivos de base de datos con seguridad (puede ser incompatible con Dropbox, etcétera)</translation>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
-        <translation>Hacer una copia de seguridad de la base de datos antes de guardar</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
-        <translation>Gestión de entrada</translation>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>General</translation>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
-        <translation>Intervalos</translation>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>Limpiar el portapapeles después de</translation>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>segundos</translation>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>Bloquear base de datos tras un periodo de inactividad de</translation>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Conveniencia</translation>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Bloquear base de datos cuando la sesión está bloqueada o la pantalla esté cerrada</translation>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>Bloquear base de datos al minimizar la ventana</translation>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>TotpDialog</name>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>No pedir repetición de la contraseña cuando está visible</translation>
+        <source>Timed Password</source>
+        <translation>Contraseña Cronometrada</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Mostrar contraseñas en texto claro por defecto</translation>
+        <source>000000</source>
+        <translation>000000</translation>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
-        <translation>Ocultar contraseñas en el panel de vista previa</translation>
+        <source>Copy</source>
+        <translation>Copiar</translation>
     </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation><numerusform>Caduca en &lt;b&gt;%n&lt;/b&gt; segundo(s)</numerusform><numerusform>Caduca en &lt;b&gt;%n&lt;/b&gt; segundo (s)</numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
     <message>
-        <source>Hide entry notes by default</source>
-        <translation>Ocultar notas de entrada por defecto</translation>
+        <source>Copy</source>
+        <translation>Copiar</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>Privacidad</translation>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation>NOTA: Esta configuración de TOTP es personalizada y puede que no funcione con otros autenticadores.</translation>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>Usar Google como una alternativa para descargar iconos de sitios web</translation>
+        <source>There was an error creating the QR code.</source>
+        <translation>Se ha producido un error al crear el código QR.</translation>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
-        <translation>Volver a bloquear la base de datos tras realizar una Auto-Escritura </translation>
+        <source>Closing in %1 seconds.</source>
+        <translation>Cernado en %1 segundos.</translation>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation>Configurar TOTP</translation>
@@ -3992,59 +5347,84 @@ Por favor desbloquee la base de datos seleccionada o elija otra que esté desblo
         <translation>Usar configuración personalizada</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>Nota: Cambie estas configuraciones sólo si sabe lo que está haciendo.</translation>
+        <source>Custom Settings</source>
+        <translation>Configuración personalizada</translation>
     </message>
     <message>
         <source>Time step:</source>
         <translation>Paso del tiempo:</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8 dígitos</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>segundos</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>Tamaño del código:</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6 dígitos</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>Tamaño del código:</translation>
+        <source>7 digits</source>
+        <translation>7 digitos</translation>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>segundos</translation>
+        <source>8 digits</source>
+        <translation>8 dígitos</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>Contraseña Cronometrada</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Copiar</translation>
+        <source>Close</source>
+        <translation>Cerrar</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>Expira en</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>segundos</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>Desbloquear base de datos</translation>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4079,42 +5459,26 @@ Por favor desbloquee la base de datos seleccionada o elija otra que esté desblo
     </message>
 </context>
 <context>
-    <name>main</name>
-    <message>
-        <source>Remove an entry from the database.</source>
-        <translation>Quitar una entrada de la base de datos.</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>Ruta a la base de datos.</translation>
-    </message>
-    <message>
-        <source>Path of the entry to remove.</source>
-        <translation>Camino de la entrada a quitar.</translation>
-    </message>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - gestor de claves multiplataforma</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>nombre de archivo de la base de datos de contraseñas a abrir (*.kdbx)</translation>
+        <source>Refresh</source>
+        <translation>Actualizar</translation>
     </message>
     <message>
-        <source>path to a custom config file</source>
-        <translation>ruta a un archivo de configuración personalizado</translation>
+        <source>YubiKey Challenge-Response</source>
+        <translation>Desafío/respuesta Yubikey</translation>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>archivo llave de la base de datos</translation>
+        <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>&lt;p&gt;Si posee una &lt;a href=&quot;https://www.yubico.com/&quot;&gt;YubiKey&lt;/a&gt;, puede usarla para seguridad adicional.&lt;/p&gt;&lt;p&gt; La YubiKey requiere que una de sus ranuras esté programada como &lt;a href=&quot;https://www.yubico.com/products/services-software/personalization-tools/challenge-response/&quot;&gt;Desafío/respuesta HMAC-SHA1&lt;/a&gt;.&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>leer contraseña de la base de datos desde la entrada estándar</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation>No se ha detectado YubiKey, asegúrese de que esté conectado.</translation>
     </message>
     <message>
-        <source>Parent window handle</source>
-        <translation>Identificador de la ventana padre</translation>
+        <source>No YubiKey inserted.</source>
+        <translation>No hay YubiKey insertado.</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_eu.ts b/share/translations/keepassx_eu.ts
index 922b6efd8..93fca6455 100644
--- a/share/translations/keepassx_eu.ts
+++ b/share/translations/keepassx_eu.ts
@@ -38,12 +38,6 @@
         <translation>Kopiatu arbelera</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>%1 bertsioa
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>Berrikuspena: %1</translation>
     </message>
@@ -76,32 +70,47 @@ Kernel: %3 %4</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
+        <source>Version %1</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
+        <source>Build Type: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>Gogoratu erabaki hau</translation>
+        <source>Auto-Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Onartu</translation>
+        <source>Browser Integration</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>Debekatu</translation>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>%1 has requested access to passwords for the following item(s).
-Please select whether you want to allow access.</source>
+        <source>YubiKey</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -111,6 +120,277 @@ Please select whether you want to allow access.</source>
         <source>Enable SSH Agent (requires restart)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Aplikazioaren ezarpenak</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Orokorra</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Segurtasuna</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Oinarrizko ezarpenak</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Gogoratu azken datu-baseak</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Automatikoki gorde aldaketa oro eta gero</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Automatikoki gorde irtetean</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>Erabili taldearen ikonoa sarrera sortzean</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Minimizatu arbelera kopiatzean</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Orokorra</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Erakutsi ikonoa sistema-erretiluan</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Hizkuntza</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation> ms</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>Pribatasuna</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -213,6 +493,26 @@ Please select whether you want to allow access.</source>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Utzi</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -286,14 +586,6 @@ Please select whether you want to allow access.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>Aurreratua</translation>
     </message>
@@ -359,19 +651,36 @@ Please select whether you want to allow access.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <source>Select custom proxy location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Executable Files (*)</source>
+        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Select custom proxy location</source>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
+        <source>&amp;Tor Browser</source>
+        <translation type="unfinished"/>
+    </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: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not ask permission for HTTP &amp;Basic Auth</source>
+        <extracomment>An extra HTTP Basic Auth setting</extracomment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -410,147 +719,42 @@ Do you want to overwrite it?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
+        <source>Abort</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain a settings entry.</source>
+        <source>Converting attributes to custom data…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Ez da gakorik aurkitu</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <source>Successfully moved %n keys to custom data.</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Removing stored permissions…</source>
-        <translation>Gordetako baimenak kentzen...</translation>
-    </message>
-    <message>
-        <source>Abort</source>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Kendutako baimenak</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <source>KeePassXC: No entry with permissions found!</source>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>Pasahitza</translation>
-    </message>
     <message>
-        <source>Enter password:</source>
-        <translation>Sartu pasahitza:</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>Errepikatu pasahitza:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;Gako fitxategia</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>Arakatu</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Sortu</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Freskatu</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>Gako fitxategiak</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>Fitxategi guztiak</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>Sortu gako fitxategia...</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>Ezin izan da gako fitxategia sortu :</translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>Aukeratu gako fitxategia</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Hustu pasahitza</translation>
-    </message>
-    <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>Kate hutsa pasahitz modura erabili?</translation>
-    </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>Pasahitz desberdinak paratu dira.</translation>
-    </message>
-    <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation type="unfinished"/>
-    </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 type="unfinished"/>
-    </message>
-    <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -632,14 +836,6 @@ Please consider generating a new key file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>zutabea</translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation type="unfinished"/>
     </message>
@@ -648,47 +844,84 @@ Please consider generating a new key file.</source>
         <translation>Jatorrizko datuak:</translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>Errorea(k) detektatu d(ir)a CSV fitxategian !</translation>
+        <source>Error</source>
+        <translation>Errorea</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
+        <source>Empty fieldname %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Errorea</translation>
+        <source>column %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
+        <source>Error(s) detected in CSV file!</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>Errorea</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Ezin izan da gako nagusia kalkulatu</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
-        <translation><numerusform>byte %n</numerusform><numerusform>%n byte</numerusform></translation>
+        <source>%n column(s)</source>
+        <translation><numerusform>zutabe %n</numerusform><numerusform>%n zutabe</numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
-        <translation><numerusform>lerro %n</numerusform><numerusform>%n lerro</numerusform></translation>
+        <source>%n byte(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
-        <translation><numerusform>zutabe %n</numerusform><numerusform>%n zutabe</numerusform></translation>
+        <source>%n row(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -718,14 +951,6 @@ Please consider generating a new key file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Ezin izan da datu-basea ireki.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Ezin da gako fitxategia ireki</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation type="unfinished"/>
     </message>
@@ -752,102 +977,169 @@ Please consider generating a new key file.</source>
         <source>Select key file</source>
         <translation>Aukeratu gako-fitxategia</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>Konpondu datu-basea</translation>
+        <source>TouchID for quick unlock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Errorea</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Ezin da gako fitxategia ireki</translation>
+        <source>Can't open key file:
+%1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Ezin izan da datu-basea ireki.</translation>
+        <source>Passwords</source>
+        <translation>Pasahitzak</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
+        <source>Advanced Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Success</source>
+        <source>General</source>
+        <translation>Orokorra</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Segurtasuna</translation>
+    </message>
+    <message>
+        <source>Master Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>Datu-basea era egokian konpondu da
-Gorde daiteke orain.</translation>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>Ezin izan da datu-basea konpondu.</translation>
+        <source>Browser Integration</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>Orokorra</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>Zifraketa</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
+        <source>Forg&amp;et all site-specific settings on entries</source>
         <translation type="unfinished"/>
     </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>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Understood, keep number</source>
+        <source>Stored keys</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>Utzi</translation>
+        <source>Remove</source>
+        <translation>Kendu</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
+        <source>Delete the selected key?</source>
         <translation type="unfinished"/>
     </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>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KDF unchanged</source>
+        <source>Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Ez da gakorik aurkitu</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Gordetako baimenak kentzen...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Kendutako baimenak</translation>
+    </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
+        <source>Successfully removed permissions from %n entry(s).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetEncryption</name>
@@ -883,6 +1175,109 @@ If you keep this number, your database may be too easy to crack!</source>
         <source>Parallelism:</source>
         <translation>Paralelismoa:</translation>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Utzi</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -932,89 +1327,110 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
+        <source>Sharing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 datu-basea</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Fitxategi guztiak</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Ireki datu-basea</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>Fitxategia ez da aurkitu!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Ezin izan da datu-basea ireki.</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>Ireki CSV fitxategia</translation>
+        <source>Add additional protection...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>CSV fitxategia</translation>
+        <source>No encryption key added</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>Fitxategi guztiak (*)</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Bateratu datu-basea</translation>
+        <source>No password set</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Ireki KeePass 1 datu-basea</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 type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1 datu-basea</translation>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>Itxi?</translation>
+        <source>Failed to change master key</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
+        <source>Database Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>Aldaketak gorde?</translation>
+        <source>Description:</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation type="unfinished"/>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 datu-basea</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation type="unfinished"/>
+        <source>All files</source>
+        <translation>Fitxategi guztiak</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Pasahitzak</translation>
+        <source>Open database</source>
+        <translation>Ireki datu-basea</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Gorde datu-basea honela</translation>
+        <source>CSV file</source>
+        <translation>CSV fitxategia</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>Bateratu datu-basea</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Ireki KeePass 1 datu-basea</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 datu-basea</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1025,35 +1441,39 @@ Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>New database</source>
-        <translation>Datu-base berria</translation>
+        <source>Database creation error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>locked</source>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Lock database</source>
+        <source>The database file does not exist or is not accessible.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
+        <source>Select CSV file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
+        <source>New Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disable safe saves?</source>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
         <translation type="unfinished"/>
     </message>
     <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>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1064,37 +1484,13 @@ Disable safe saves and try again?</source>
         <translation>Bilatzen...</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>Aldatu gako nagusia</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>Ezabatu sarrera?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Ezabatu sarrerak?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation type="unfinished"/>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation><numerusform>Ziur zaude sarrera %n zakarrontzira mugitu nahi duzula?</numerusform><numerusform>Ziur zaude %n sarrera zakarrontzira mugitu nahi dituzula?</numerusform></translation>
@@ -1112,18 +1508,10 @@ Disable safe saves and try again?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Ezabatu taldea?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Ezin izan da gako nagusia kalkulatu</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation type="unfinished"/>
     </message>
@@ -1157,10 +1545,6 @@ Do you want to merge your changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation type="unfinished"/>
     </message>
@@ -1168,88 +1552,102 @@ Do you want to merge your changes?</source>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation type="unfinished"/>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Itxi</translation>
+        <source>File opened in read only mode.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Orokorra</translation>
+        <source>Lock Database?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Pasahitza</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>Iraungitzea</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Erabiltzaile-izena</translation>
+        <source>Save changes?</source>
+        <translation>Aldaketak gorde?</translation>
     </message>
     <message>
-        <source>Autotype</source>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>Bilatzen</translation>
+        <source>Disable safe saves?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Attributes</source>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Attachments</source>
+        <source>Writing the database failed.
+%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Oharrak</translation>
+        <source>Passwords</source>
+        <translation>Pasahitzak</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>Leihoa</translation>
+        <source>Save database as</source>
+        <translation>Gorde datu-basea honela</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>Sekuentzia</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 datu-basea</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Bilatu</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Garbitu</translation>
+        <source>Delete group</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Never</source>
-        <translation>Inoiz</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[BABESTUA]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>Ezgaitua</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Gaitua</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1323,22 +1721,10 @@ Do you want to merge your changes?</source>
         <translation>Gehitu ezaugarria</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Baieztatu kentzea</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[BABESTUA]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>Bihar</translation>
     </message>
@@ -1351,10 +1737,6 @@ Do you want to merge your changes?</source>
         <translation><numerusform>hilabete %n</numerusform><numerusform>%n hilabete</numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>urte 1</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation type="unfinished"/>
     </message>
@@ -1366,6 +1748,26 @@ Do you want to merge your changes?</source>
         <source>Entry updated successfully.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1611,6 +2013,81 @@ Do you want to merge your changes?</source>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Pasahitza:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1668,10 +2145,6 @@ Do you want to merge your changes?</source>
         <translation>Ezin izan da favicon-a atzitu.</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Images</source>
         <translation>Irudiak</translation>
     </message>
@@ -1680,25 +2153,45 @@ Do you want to merge your changes?</source>
         <translation>Fitxategi guztiak</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Aukeratu irudia</translation>
+        <source>Custom icon already exists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm Delete</source>
+        <translation>Baieztatu ezabaketa</translation>
     </message>
     <message>
-        <source>Can&apos;t read icon</source>
+        <source>Custom icon successfully downloaded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Custom icon already exists</source>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Confirm Delete</source>
-        <translation>Baieztatu ezabaketa</translation>
+        <source>Select Image(s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
+        <source>No icons were loaded</source>
         <translation type="unfinished"/>
     </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>
@@ -1747,9 +2240,8 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation> - Klonatu</translation>
+        <source>%1 - Clone</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1794,10 +2286,6 @@ This may cause the affected plugins to malfunction.</source>
         <translation><numerusform>Ziur zaude eranskin %n kendu nahi duzula?</numerusform><numerusform>Ziur zaude %n eranskin kendu nahi dituzula?</numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Baieztatu kentzea</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>Gorde eranskinak</translation>
     </message>
@@ -1830,10 +2318,14 @@ This may cause the affected plugins to malfunction.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open files:
-%1</source>
+        <source>Confirm remove</source>
         <translation type="unfinished"/>
     </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
+%1</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
 </context>
 <context>
     <name>EntryAttributesModel</name>
@@ -1916,108 +2408,166 @@ This may cause the affected plugins to malfunction.</source>
         <source>Attachments</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>EntryView</name>
     <message>
-        <source>Customize View</source>
+        <source>Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide Usernames</source>
+        <source>TOTP</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
     <message>
-        <source>Hide Passwords</source>
+        <source>Generate TOTP Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fit to window</source>
-        <translation type="unfinished"/>
+        <source>Close</source>
+        <translation>Itxi</translation>
     </message>
     <message>
-        <source>Fit to contents</source>
+        <source>General</source>
+        <translation>Orokorra</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Erabiltzaile-izena</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Pasahitza</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Iraungitzea</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Reset to defaults</source>
+        <source>Attachments</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Attachments (icon)</source>
+        <source>Notes</source>
+        <translation>Oharrak</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Group</name>
     <message>
-        <source>Recycle Bin</source>
-        <translation>Zakarrontzia</translation>
+        <source>Window</source>
+        <translation>Leihoa</translation>
     </message>
-</context>
-<context>
-    <name>HostInstaller</name>
     <message>
-        <source>KeePassXC: Cannot save file!</source>
+        <source>Sequence</source>
+        <translation>Sekuentzia</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Bilatzen</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Bilatu</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Garbitu</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Inoiz</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[BABESTUA]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot save the native messaging script file.</source>
+        <source>Enabled</source>
+        <translation>Gaitua</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Ezgaitua</translation>
+    </message>
+    <message>
+        <source>Share</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>Luzeera</translation>
-    </message>
+    <name>EntryView</name>
     <message>
-        <source>Character Types</source>
-        <translation>Karaktere motak</translation>
+        <source>Customize View</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Upper Case Letters</source>
-        <translation>Letra larriak</translation>
+        <source>Hide Usernames</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
+        <source>Hide Passwords</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lower Case Letters</source>
-        <translation>Letra xeheak</translation>
+        <source>Fit to window</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
+        <source>Fit to contents</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Numbers</source>
-        <translation>Zenbakiak</translation>
+        <source>Reset to defaults</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
+        <source>Attachments (icon)</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Group</name>
     <message>
-        <source>Special Characters</source>
-        <translation>Karaktere bereziak</translation>
+        <source>Recycle Bin</source>
+        <translation>Zakarrontzia</translation>
     </message>
     <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>GroupModel</name>
     <message>
-        <source>Exclude look-alike characters</source>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>HostInstaller</name>
     <message>
-        <source>Ensure that the password contains characters from every group</source>
+        <source>KeePassXC: Cannot save file!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extended ASCII</source>
+        <source>Cannot save the native messaging script file.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -2046,6 +2596,26 @@ This may cause the affected plugins to malfunction.</source>
         <source>Wrong key or database file is corrupt.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2205,10 +2775,6 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation type="unfinished"/>
     </message>
@@ -2259,6 +2825,18 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Unsupported KeePass 2 database version.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2331,10 +2909,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation type="unfinished"/>
     </message>
@@ -2383,6 +2957,12 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2546,61 +3126,147 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Invalid entry field type</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <source>Disabled share</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <source>Import from</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
+        <source>Export to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
+        <source>Synchronize with</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Errorea</translation>
+        <source>Key Component</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Utzi</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>KeyFileEditWidget</name>
     <message>
-        <source>&amp;Database</source>
-        <translation>&amp;Datu-basea</translation>
+        <source>Browse</source>
+        <translation>Arakatu</translation>
     </message>
     <message>
-        <source>&amp;Recent databases</source>
+        <source>Generate</source>
+        <translation>Sortu</translation>
+    </message>
+    <message>
+        <source>Key File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Inportatu</translation>
+        <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"/>
     </message>
     <message>
-        <source>&amp;Help</source>
-        <translation>&amp;Laguntza</translation>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>E&amp;ntries</source>
-        <translation>Sa&amp;rrerak</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
+        <source>Error loading the key file '%1'
+Message: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Time-based one-time password</source>
+        <source>Key files</source>
+        <translation>Gako fitxategiak</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Fitxategi guztiak</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Sortu gako fitxategia...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Aukeratu gako fitxategia</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>&amp;Datu-basea</translation>
+    </message>
+    <message>
+        <source>&amp;Recent databases</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>&amp;Help</source>
+        <translation>&amp;Laguntza</translation>
+    </message>
+    <message>
+        <source>E&amp;ntries</source>
+        <translation>Sa&amp;rrerak</translation>
+    </message>
+    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Taldeak</translation>
     </message>
@@ -2629,30 +3295,10 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Itxi datubasea</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>&amp;Datu-base berria</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>&amp;Gehitu sarrera berria</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>&amp;Ikusi/Editatu sarrera</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>&amp;Ezabatu sarrera</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>&amp;Gehitu talde berria</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>&amp;Editatu taldea</translation>
     </message>
@@ -2665,14 +3311,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>&amp;Datu-basearen ezarpenak</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>Datu-basearen ezarpenak</translation>
     </message>
@@ -2681,10 +3319,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Klonatu sarrera</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>&amp;Bilatu</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>Kopiatu &amp;erabiltzailea</translation>
     </message>
@@ -2693,10 +3327,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Kopiatu erabiltzaile-izena arbelera</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>Kopiatu pasahitza</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>Kopiatu pasahitza arbelera</translation>
     </message>
@@ -2709,14 +3339,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Pasahitz sortzailea</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation type="unfinished"/>
     </message>
@@ -2749,309 +3371,436 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
+        <source>Set up TOTP...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import CSV file...</source>
+        <source>Copy &amp;TOTP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;pair database...</source>
+        <source>E&amp;mpty recycle bin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show TOTP</source>
+        <source>Clear history</source>
+        <translation>Garbitu historia</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Set up TOTP...</source>
+        <source>Settings</source>
+        <translation>Ezarpenak</translation>
+    </message>
+    <message>
+        <source>Toggle window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
+        <source>Quit KeePassXC</source>
+        <translation>Irten KeePassXC-tik</translation>
+    </message>
+    <message>
+        <source>Please touch the button on your YubiKey!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>E&amp;mpty recycle bin</source>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear history</source>
-        <translation>Garbitu historia</translation>
+        <source>&amp;Donate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
+        <source>Report a &amp;bug</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>read-only</source>
+        <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Ezarpenak</translation>
+        <source>Copy att&amp;ribute...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Toggle window</source>
+        <source>TOTP...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Quit KeePassXC</source>
-        <translation>Irten KeePassXC-tik</translation>
+        <source>&amp;New database...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 datu-basea</translation>
+        <source>Create a new database</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Fitxategi guztiak</translation>
+        <source>&amp;Merge from database...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Ireki datu-basea</translation>
+        <source>Merge from another KDBX database</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save repaired database</source>
+        <source>&amp;New entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Writing the database failed.</source>
+        <source>Add a new entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
+        <source>&amp;Edit entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
+        <source>View or edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>OpenSSHKey</name>
+    <name>Merger</name>
     <message>
-        <source>Invalid key file, expecting an OpenSSH key</source>
+        <source>Creating missing %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>PEM boundary mismatch</source>
+        <source>Relocating %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Base64 decoding failed</source>
+        <source>Overwriting %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key file way too small.</source>
+        <source>older entry merged from database &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key file magic header id invalid</source>
+        <source>Adding backup for older target %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Found zero keys</source>
+        <source>Adding backup for older source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to read public key.</source>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Corrupted key file, reading private key failed</source>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>No private key payload to decrypt</source>
+        <source>Synchronizing from newer source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Trying to run KDF without cipher</source>
+        <source>Synchronizing from older source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase is required to decrypt this key</source>
+        <source>Deleting child %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key derivation failed, key file corrupted?</source>
+        <source>Deleting orphan %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Decryption failed, wrong passphrase?</source>
+        <source>Changed deleted objects</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unexpected EOF while reading public key</source>
+        <source>Adding missing icon %1</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
     <message>
-        <source>Unexpected EOF while reading private key</source>
+        <source>Create a new KeePassXC database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t write public key as it is empty</source>
+        <source>Root</source>
+        <comment>Root group</comment>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
     <message>
-        <source>Unexpected EOF when writing public key</source>
+        <source>WizardPage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t write private key as it is empty</source>
+        <source>En&amp;cryption Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unexpected EOF when writing private key</source>
+        <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"/>
     </message>
     <message>
-        <source>Unsupported key type: %1</source>
+        <source>Advanced Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unknown cipher: %1</source>
+        <source>Simple Settings</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
     <message>
-        <source>Cipher IV is too short for MD5 kdf</source>
+        <source>Encryption Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unknown KDF: %1</source>
+        <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"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
     <message>
-        <source>Unknown key type: %1</source>
+        <source>Database Master Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>NewDatabaseWizardPageMetaData</name>
     <message>
-        <source>Dialog</source>
-        <translation>Elkarrizketa</translation>
+        <source>General Database Information</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>Hau beharrezkoa da ChromeIPass edo PassIFox erabilita datu-baseetara sarbidea izateko</translation>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>Gaitu KeePassHTTP zerbitzaria</translation>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Orokorra</translation>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <source>Base64 decoding failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <source>Key file way too small.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return only best matching entries</source>
+        <source>Key file magic header id invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <source>Found zero keys</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
+        <source>Failed to read public key.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Match URL schemes</source>
+        <source>Corrupted key file, reading private key failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
+        <source>No private key payload to decrypt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
+        <source>Trying to run KDF without cipher</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
+        <source>Passphrase is required to decrypt this key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <source>Key derivation failed, key file corrupted?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>Pasahitz sortzailea</translation>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Aurreratua</translation>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
+        <source>Unexpected EOF while reading private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
+        <source>Can&apos;t write public key as it is empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only the selected database has to be connected with a client.</source>
+        <source>Unexpected EOF when writing public key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <source>Can&apos;t write private key as it is empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
+        <source>Unexpected EOF when writing private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <source>Unsupported key type: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP portua:</translation>
+        <source>Unknown cipher: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Portu lehenetsia: 19455</translation>
+        <source>Cipher IV is too short for MD5 kdf</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <source>Unknown KDF: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <source>Unknown key type: %1</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <source>Enter password:</source>
+        <translation>Sartu pasahitza:</translation>
+    </message>
+    <message>
+        <source>Confirm password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
+        <source>Password</source>
+        <translation>Pasahitza</translation>
+    </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"/>
+    </message>
+    <message>
+        <source>Password cannot be empty.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
+        <source>Passwords do not match.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate master password</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -3123,18 +3872,10 @@ Using default port 19455.</source>
         <translation>Hitz zerrenda:</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Hitz kopurua:</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>Hitz banatzailea:</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>Sortu</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Kopiatu</translation>
     </message>
@@ -3147,10 +3888,6 @@ Using default port 19455.</source>
         <translation>Itxi</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>Aplikatu</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>Entropia: %1 bit</translation>
     </message>
@@ -3178,51 +3915,200 @@ Using default port 19455.</source>
         <comment>Password quality</comment>
         <translation>Bikaina</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Aurreratua</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>QObject</name>
+    <name>QApplication</name>
     <message>
-        <source>Database not opened</source>
+        <source>KeeShare</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>QFileDialog</name>
     <message>
-        <source>Database hash not available</source>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Client public key not received</source>
+        <source>Delete</source>
+        <translation>Ezabatu</translation>
+    </message>
+    <message>
+        <source>Move</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot decrypt message</source>
+        <source>Empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
+        <source>Remove</source>
+        <translation>Kendu</translation>
+    </message>
+    <message>
+        <source>Skip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Action cancelled or denied</source>
+        <source>Disable</source>
+        <translation>Ezgaitu</translation>
+    </message>
+    <message>
+        <source>Merge</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <source>Database not opened</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC association failed, try again</source>
+        <source>Database hash not available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key change was not successful</source>
+        <source>Client public key not received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Encryption key is not recognized</source>
+        <source>Cannot decrypt message</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>No saved databases found</source>
+        <source>Encryption key is not recognized</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -3351,10 +4237,6 @@ Using default port 19455.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3433,11 +4315,6 @@ Available commands:
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>fitxategia hutsik dago!</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation type="unfinished"/>
     </message>
@@ -3446,6 +4323,371 @@ Available commands:
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Group</source>
+        <translation>Taldea</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Izenburua</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Erabiltzaile-izena</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Pasahitza</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Oharrak</translation>
+    </message>
+    <message>
+        <source>Last Modified</source>
+        <translation>Azken aldaketa</translation>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Press</source>
+        <translation>Sakatu</translation>
+    </message>
+    <message>
+        <source>Passive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new random diceware passphrase.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word count for the diceware passphrase.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wordlist for the diceware generator.
+[Default: EFF English]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new random password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>AES: 256-bit</source>
         <translation>AES: 256-bit</translation>
     </message>
@@ -3470,100 +4712,113 @@ Available commands:
         <translation>AES-KDF (KDBX 3.1)</translation>
     </message>
     <message>
-        <source>Group</source>
-        <translation>Taldea</translation>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Title</source>
-        <translation>Izenburua</translation>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Erabiltzaile-izena</translation>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Pasahitza</translation>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Oharrak</translation>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Last Modified</source>
-        <translation>Azken aldaketa</translation>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Created</source>
+        <source>Loading the key file failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
+        <source>No key is set. Aborting database creation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Browser Integration</source>
+        <source>Failed to save the database: %1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
+        <source>Successfully created new database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Press</source>
-        <translation>Sakatu</translation>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passive</source>
+        <source>Creating KeyFile %1 failed: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>SSH Agent</source>
+        <source>Loading KeyFile %1 failed: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Generate a new random diceware passphrase.</source>
+        <source>Remove an entry from the database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word count for the diceware passphrase.</source>
+        <source>Path of the entry to remove.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>count</source>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist for the diceware generator.
-[Default: EFF English]</source>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Generate a new random password.</source>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - plataforma anitzeko pasahitz kudeatzailea</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Length of the generated password.</source>
+        <source>path to a custom config file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
+        <source>key file of the database</source>
+        <translation>datu-basearen gako-fitxategia</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
+        <source>Parent window handle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
+        <source>Another instance of KeePassXC is already running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
+        <source>Fatal error while testing the cryptographic functions.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Errorea</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -3602,324 +4857,416 @@ Available commands:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
     <message>
-        <source>Search...</source>
-        <translation>Bilatu...</translation>
+        <source>Agent connection failed.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Bilatu</translation>
+        <source>Agent protocol error.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Garbitu</translation>
+        <source>No agent running, cannot add identity.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Case Sensitive</source>
+        <source>No agent running, cannot remove identity.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Limit search to selected group</source>
+        <source>Agent refused this identity. Possible reasons include:</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Service</name>
     <message>
-        <source>KeePassXC: New key association request</source>
+        <source>The key has already been added.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: Gainidatzi aurreko gakoa?</translation>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
+        <source>Search Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: Eguneratu sarrera</translation>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
+        <source>Every search term must match (ie, logical AND)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
+        <source>Modifiers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
+        <source>exclude term from results</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
+        <source>match term exactly</source>
         <translation type="unfinished"/>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    <message>
+        <source>use regex in term</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Ez da gakorik aurkitu</translation>
+        <source>Fields</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <source>Term Wildcards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
+        <source>match anything</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <source>match one</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>Gordetako baimenak kentzen...</translation>
+        <source>logical OR</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
+        <source>Examples</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SearchWidget</name>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Kendutako baimenak</translation>
+        <source>Search</source>
+        <translation>Bilatu</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    <message>
+        <source>Clear</source>
+        <translation>Garbitu</translation>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
+        <source>Limit search to selected group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Case sensitive</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SettingsWidget</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>Application Settings</source>
-        <translation>Aplikazioaren ezarpenak</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Orokorra</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>Segurtasuna</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
+        <source>Own certificate</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>Oinarrizko ezarpenak</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
+        <source>Certificate:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>Gogoratu azken datu-baseak</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
+        <source>Key:</source>
+        <translation>Gakoa:</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Sortu</translation>
+    </message>
+    <message>
+        <source>Import</source>
+        <translation>Inportatu</translation>
+    </message>
+    <message>
+        <source>Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
+        <source>Imported certificates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>Automatikoki gorde irtetean</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>Automatikoki gorde aldaketa oro eta gero</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically reload the database when modified externally</source>
+        <source>Untrust</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>Minimizatu arbelera kopiatzean</translation>
+        <source>Remove</source>
+        <translation>Kendu</translation>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
+        <source>Path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>Erabili taldearen ikonoa sarrera sortzean</translation>
+        <source>Status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <source>Fingerprint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
+        <source>Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>Erakutsi ikonoa sistema-erretiluan</translation>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
+        <source>Untrusted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
+        <source>Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Hizkuntza</translation>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
+        <source>All files</source>
+        <translation>Fitxategi guztiak</translation>
+    </message>
+    <message>
+        <source>Select path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
+        <source>Exporting changed certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
+        <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"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Global Auto-Type shortcut</source>
+        <source>Import from container without signature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation> ms</translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
+        <source>Not this time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <source>Never</source>
+        <translation>Inoiz</translation>
+    </message>
+    <message>
+        <source>Always</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
+        <source>Just this time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
+        <source>Import from %1 failed (%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Orokorra</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
+        <source>Imported from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
+        <source>Signed share container are not supported - import prevented</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
+        <source>File is not readable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
+        <source>Invalid sharing container</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
+        <source>Untrusted import prevented</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
+        <source>Successful signed import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
+        <source>Unexpected error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
+        <source>Unsigned share container are not supported - import prevented</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
+        <source>Successful unsigned import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
+        <source>File does not exist</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide entry notes by default</source>
+        <source>Unknown share container type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>Pribatasuna</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
+        <source>Could not write export container (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TotpDialog</name>
+    <message>
+        <source>Timed Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>000000</source>
+        <translation>000000</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Kopiatu</translation>
+    </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
+    <message>
+        <source>Copy</source>
+        <translation>Kopiatu</translation>
+    </message>
+    <message>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>There was an error creating the QR code.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Closing in %1 seconds.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation type="unfinished"/>
@@ -3941,7 +5288,7 @@ Please unlock the selected database or choose another one which is unlocked.</so
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
+        <source>Custom Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -3949,50 +5296,75 @@ Please unlock the selected database or choose another one which is unlocked.</so
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8 zifra</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6 zifra</translation>
     </message>
     <message>
-        <source>Code size:</source>
+        <source>7 digits</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation type="unfinished"/>
+        <source>8 digits</source>
+        <translation>8 zifra</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
+        <source>Checking for updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Kopiatu</translation>
+        <source>Close</source>
+        <translation>Itxi</translation>
     </message>
     <message>
-        <source>Expires in</source>
+        <source>Update Error!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>segundu</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
+        <source>KeePassXC %1 is currently the newest version available</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -4028,41 +5400,25 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
 </context>
 <context>
-    <name>main</name>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>Remove an entry from the database.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Path of the entry to remove.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - plataforma anitzeko pasahitz kudeatzailea</translation>
+        <source>Refresh</source>
+        <translation>Freskatu</translation>
     </message>
     <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
+        <source>YubiKey Challenge-Response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>path to a custom config file</source>
+        <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"/>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>datu-basearen gako-fitxategia</translation>
-    </message>
-    <message>
-        <source>read password of the database from stdin</source>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Parent window handle</source>
+        <source>No YubiKey inserted.</source>
         <translation type="unfinished"/>
     </message>
 </context>
diff --git a/share/translations/keepassx_fi.ts b/share/translations/keepassx_fi.ts
index e61a383a8..5331bb6be 100644
--- a/share/translations/keepassx_fi.ts
+++ b/share/translations/keepassx_fi.ts
@@ -38,12 +38,6 @@
         <translation>Kopioi leikepöydälle</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>Versio %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>Revisio: %1</translation>
     </message>
@@ -76,34 +70,48 @@ Ydin: %3 %4</translation>
         <translation>KeePassXC-tiimi antaa erityiskiitokset KeePassX-ohjelman alkuperäiselle luojalle debfx:lle</translation>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
-        <translation>Julkaisun tyyppi: %1</translation>
+        <source>Version %1</source>
+        <translation>Versio %1</translation>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP - Vahvista pääsy</translation>
+        <source>Build Type: %1</source>
+        <translation>Ohjelmiston tyyppi</translation>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>Muista tämä valinta</translation>
+        <source>Auto-Type</source>
+        <translation>Automaattisyöttö</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Salli</translation>
+        <source>Browser Integration</source>
+        <translation>Selainintegraatio</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>Estä</translation>
+        <source>SSH Agent</source>
+        <translation>SSH-agentti</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>%1 pyytää pääsyä seuraavien kohteiden salasanoihin.
-Valitse sallitaanko pääsy.</translation>
+        <source>YubiKey</source>
+        <translation>YubiKey</translation>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation>TouchID</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Ei mitään</translation>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -112,6 +120,277 @@ Valitse sallitaanko pääsy.</translation>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>Käytä SSH-agenttia (vaatii uudelleenkäynnistyksen)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Sovelluksen asetukset</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Yleistä</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Turvallisuus</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Pääsyvirhe asetustiedostoon %1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Perusasetukset</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>Käynnistys</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Käynnistä vain yksi KeePassXC-instanssi</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Muista viimeisimmät tietokannat</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Muista viimeisimmät avaintiedostot ja tietoturva-avainlaitteet (donglet)</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Lataa edelliset tietokannat käynnistäessä</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>Pienennä ikkuna ohjelman käynnistyessä</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>Tiedostohallinta</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation>Tallenna tietokannat turvallisesti (voi olla epäyhteensopiva Dropboxin tmv. kanssa)</translation>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation>Ota tietokannasta varmuuskopio ennen tallentamista</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Tallenna automaattisesti jokaisen muutoksen jälkeen</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Tallenna automaattisesti suljettaessa</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Älä merkitse tietokantaa muokatuksi mikäli tietueet eivät muutu (esim. ryhmien laajentamisen yhteydessä)</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Lataa tietokanta automaattisesti uudelleen jos tietokantaa muokattiin muualla</translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>Tietueiden hallinta</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>Käytä ryhmän kuvaketta tietuetta luodessa</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Pienennä ikkuna kopioidessa leikepöydälle</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation>Piilota tietueen esikatselupaneeli</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Yleistä</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation>Piilota työkalurivi (ikonit)</translation>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation>Minimoi ohjelma sulkemisen sijasta</translation>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Näytä ilmoitusalueen kuvake</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>Tumma ilmoitusalueen kuvake</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Piiloita pienennetty ikkuna ilmoitusalueelle</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Kieli</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Automaattisyöttö</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>Tietue on sopiva, jos sen nimi sisältyy kohdeikkunan otsikkoon yleisessä automaattisyötössä</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>Tietue on sopiva, jos sen osoite sisältyy kohdeikkunan otsikkoon yleisessä automaattisyötössä</translation>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>Kysy aina ennen automaattisyötön käyttämistä</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Yleisen automaattisyötön pikanäppäin</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation>Automaattisyötön kirjoituksen viive</translation>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation> ms</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation>Automaattisyötön aloitusviive</translation>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>Aikakatkaisut</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>Tyhjennä leikepöytä kun on kulunut</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> s</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>Lukitse tietokannat jos on oltu joutilaana</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation>minuuttia</translation>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation>Unohda TouchID jos on oltu joutilaana</translation>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>Mukavuus</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Lukitse tietokannat kun istunto lukitaan tai kansi suljetaan</translation>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation>Unohda TouchID kun istunto lukitaan tai kansi suljetaan</translation>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>Lukitse tietokanta ikkunan pienennyksen jälkeen</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation>Uudelleenlukitse aikaisemmin lukittu tietokanta automaattisyötön jälkeen</translation>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>Älä vaadi salasanan toistoa jos salasana on näkyvillä</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation>Älä piilota salasanoja muokkauksen aikana</translation>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation>Älä näytä paikkamerkkiä tyhjissä salasanakentissä</translation>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation>Piilota salasanat tietueiden esikatselupaneelissa</translation>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>Piilota tietueiden muistiinpanot</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>Yksityisyys</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation>Käytä DuckDuckGo:ta sivustojen ikonien lataukseen</translation>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -215,6 +494,27 @@ Ole hyvä ja valitse sallitaanko pääsy.</translation>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation>KeePassXC-Browser - Tallenna tietue</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Peruuta</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation>Useita tietokantoja on auki
+Valitse oikea tietokanta tietueen tallentamiseksi</translation>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -288,14 +588,6 @@ Ole hyvä ja valitse sallitaanko pääsy.</translation>
         <translation>Jä&amp;rjestä vastaavat tilitiedot käyttäjätunnuksen mukaan</translation>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>&amp;Katkaise yhteys kaikkiin selaimiin</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>Unohda kaikki muistetut &amp;oikeudet</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>Lisäasetukset</translation>
     </message>
@@ -361,14 +653,6 @@ Ole hyvä ja valitse sallitaanko pääsy.</translation>
         <translation>&lt;b&gt;Varoitus:&lt;/b&gt; Seuraavat valinnat voivat olla vaarallisia!</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>Suoritettavat tiedostot (*.exe);;Kaikki tiedostot (*.*)</translation>
-    </message>
-    <message>
-        <source>Executable Files (*)</source>
-        <translation>Suoritettavat tiedostot (*)</translation>
-    </message>
-    <message>
         <source>Select custom proxy location</source>
         <translation>Valitse mukautettu välitysohjelma</translation>
     </message>
@@ -376,6 +660,31 @@ Ole hyvä ja valitse sallitaanko pääsy.</translation>
         <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
         <translation>Valitettavasti KeePassXC-Browser ei tällä hetkellä tue Snap-julkaisuja.</translation>
     </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation>KeePassXC-Browser tarvitaan selainintegraation toimimiseksi. &lt;br /&gt;Lataa se selaimille %1 ja %2.</translation>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation>&amp;Tor-selain</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: </source>
+        <translation>&lt;b&gt;Varoitus&lt;/b&gt;, keepassxc-proxy -ohjelmaa ei löydy!&lt;br /&gt;Ole hyvä ja tarkista KeePassXC:n asennushakemisto tai varmista mukautettu polku lisäasetuksista.&lt;br /&gt;Selainintegraatio ei toimi ilman välitysohjelmaa.&lt;br /&gt;Odotettu polku:</translation>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation>Suoritettavat tiedostot</translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation>Kaikki tiedostot</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"/>
+    </message>
 </context>
 <context>
     <name>BrowserService</name>
@@ -415,153 +724,46 @@ Haluatko korvata sen?</translation>
         <translation>Haluatko päivittää tiedot osoitteesta %1 - %2?</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Tietokanta lukittu!</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Aktiivinen tietokanta on lukittu!
-Avaa valittu tietokanta tai valitse toinen avattu tietokanta.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Asetukset eivät ole käytettävissä!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation>Aktiivinen tietokanta ei sisällä asetustietuetta</translation>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Avaimia ei löytynyt</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation>Jaettuja salausavaimia ei löytynyt KeePassXC-asetuksista</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Poistettiin avaimet tietokannasta</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation><numerusform>Poistettiin %n salausavain(ta) KeePassXC-asetuksista.</numerusform><numerusform>Poistettiin %n salausavain(ta) KeePassXC-asetuksista.</numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>Poistetaan talletettuja oikeuksia…</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>Keskeytä</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Poistetut käyttöoikeudet</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation><numerusform>Poistettiin käyttöoikeudet %1:n tietueen tiedoista.</numerusform><numerusform>Poistettiin käyttöoikeudet %1:n tietueen tiedoista.</numerusform></translation>
-    </message>
-    <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Tietuetta käyttöoikeuksilla ei löytynyt!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Aktiivinen tietokanta ei sisällä yhtään tietuetta käyttöoikeuksien kanssa.</translation>
+        <source>Converting attributes to custom data…</source>
+        <translation>Muutetaan attribuutteja mukautetuiksi tiedoiksi...</translation>
     </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
     <message>
-        <source>Password</source>
-        <translation>Salasana</translation>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation>KeePassXC: Muutetut KeePassHTTP-attribuutit</translation>
     </message>
     <message>
-        <source>Enter password:</source>
-        <translation>Syötä salasana:</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>Toista salasana:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;Avaintiedosto</translation>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation>Mukautettiin attribuutit onnistuneesti %1 tietueesta.
+Siirrettiin %2 avainta mukautettuihin tietoihin.</translation>
     </message>
-    <message>
-        <source>Browse</source>
-        <translation>Selaa</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Luo</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>&amp;Haaste ja vastaus</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Päivitä</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>Avaintiedostot</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>Kaikki tiedostot</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>Luo avaintiedosto...</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>Avaintiedoston luonti ei onnistunut: </translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>Valitse avaintiedosto</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Tyhjä salasana</translation>
-    </message>
-    <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>Haluatko varmasti asettaa tyhjän merkkijonon salasanaksi?</translation>
-    </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>Annetut salasanat eivät täsmää.</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation><numerusform>Siirrettiin onnistuneesti %n avainta mukautettuihin tietoihin.</numerusform><numerusform>Siirrettiin onnistuneesti %n avainta mukautettuihin tietoihin.</numerusform></translation>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>Kohteen %1 asettaminen avaintiedostoksi ei onnistunut:
-%2</translation>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation>KeePassXC: Tietueita KeePassHTTP-attribuuteilla ei löytynyt!</translation>
     </message>
     <message>
-        <source>Legacy key file format</source>
-        <translation>Vanha avaintiedostomuoto</translation>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation>Aktiivinen tietokanta ei sisällä tietueita KeePassHTTP-attribuuteilla.</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>Käytät vanhaa avaintiedostomuotoa joka ei ole
-välttämättä tuettu tulevaisuudessa.
-
-Ole hyvä ja harkitse uuden avaintiedoston luomista.</translation>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation>KeePassXC: Vanhoja selainintegraatioasetuksia havaittu</translation>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>Pääsalasanan vaihtaminen epäonnistui: YubiKeyta ei ole liitetty.</translation>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation>Vanhoja selainintegraatioasetuksia on havaittu.
+Haluatko päivittää tiedot uuteen muotoon?
+Tämä on välttämätöntä selainintegraation yhteensopivuuden takaamiseksi.</translation>
     </message>
 </context>
 <context>
@@ -642,14 +844,6 @@ Ole hyvä ja harkitse uuden avaintiedoston luomista.</translation>
         <translation>Ei mukana CSV-tiedostossa</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>Tyhjä kenttänimi </translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>sarake </translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>Tuotu CSV-tiedostosta</translation>
     </message>
@@ -658,48 +852,85 @@ Ole hyvä ja harkitse uuden avaintiedoston luomista.</translation>
         <translation>Alkuperäiset tiedot: </translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>Yksi tai useampi virhe havaittu CSV-tiedostossa!</translation>
+        <source>Error</source>
+        <translation>Virhe</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation> viestiä lisää ohitettu]</translation>
+        <source>Empty fieldname %1</source>
+        <translation>Tyhjä kentän nimi %1</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Virhe</translation>
+        <source>column %1</source>
+        <translation>sarake %1</translation>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>CSV:n tuonti: kirjoittamisessa tapahtui virhe:
-</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation>CSV-tiedostossa havaittiin virhe/virheitä!</translation>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>Virhe</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation><numerusform>[%n more message(s) skipped]</numerusform><numerusform>[%n kappaletta viestejä ohitettiin]</numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Pääavaimen laskeminen ei onnistu</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation>CSV-tuonti: kirjoituksessa on virheitä:
+%1</translation>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
-        <translation><numerusform>%n tavu.</numerusform><numerusform>%n tavua, </numerusform></translation>
+        <source>%n column(s)</source>
+        <translation><numerusform>%n sarake.</numerusform><numerusform>%n saraketta</numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation>%1, %2, %3</translation>
     </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
-        <translation><numerusform>%n rivi.</numerusform><numerusform>%n riviä, </numerusform></translation>
+        <source>%n byte(s)</source>
+        <translation><numerusform>%n tavu</numerusform><numerusform>%n tavua</numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
-        <translation><numerusform>%n sarake.</numerusform><numerusform>%n saraketta</numerusform></translation>
+        <source>%n row(s)</source>
+        <translation><numerusform>%n rivi</numerusform><numerusform>%n riviä</numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Juuri</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>Tiedostoa %1 ei ole.</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Tiedostoa %1 ei voitu avata.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation>Virhe tietokantaa luettaessa: %1</translation>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation>Tallennus ei onnistu. Tietokannalla ei ole tiedostonimeä.</translation>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation>Tiedostoa ei voitu tallentaa, sillä se on avattu vain lukuoikeuksin.</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation>Avaa Tietokanta - KeePassXC</translation>
     </message>
 </context>
 <context>
@@ -729,14 +960,6 @@ Ole hyvä ja harkitse uuden avaintiedoston luomista.</translation>
         <translation>Haaste/vastaus:</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Tietokannan avaaminen epäonnistui.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Avaintiedoston avaaminen epäonnistui</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation>Vanha avaintiedostomuoto</translation>
     </message>
@@ -766,105 +989,174 @@ Ole hyvä ja harkitse uuden avaintiedoston luomista.</translation>
         <source>Select key file</source>
         <translation>Valitse avaintiedosto</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>Korjaa tietokanta</translation>
+        <source>TouchID for quick unlock</source>
+        <translation>TouchID pika-avaukseen</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Virhe</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation>Tietokantaa ei voitu avata:
+%1</translation>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Avaintiedoston avaaminen epäonnistui</translation>
+        <source>Can't open key file:
+%1</source>
+        <translation>Avaintiedostoa ei voitu avata:
+%1</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Tietokannan avaaminen epäonnistui.</translation>
+        <source>Passwords</source>
+        <translation>Salasanat</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Tietokannan avaaminen onnistui. Ei tehtävää.</translation>
+        <source>Advanced Settings</source>
+        <translation>Lisäasetukset</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>Onnistui</translation>
+        <source>General</source>
+        <translation>Yleistä</translation>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>Tietokanta korjattiin onnistuneesti.
-Voit nyt tallentaa sen.</translation>
+        <source>Security</source>
+        <translation>Turvallisuus</translation>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>Tietokannan korjaus epäonnistui.</translation>
+        <source>Master Key</source>
+        <translation>Pääsalasana</translation>
+    </message>
+    <message>
+        <source>Encryption Settings</source>
+        <translation>Salausasetukset</translation>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation>Selainintegraatio</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>Yleistä</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation>KeePassXC-Browser -asetukset</translation>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>Salaus</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>&amp;Katkaise yhteys kaikkiin selaimiin</translation>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Iteraatioiden lukumäärä on liian suuri</translation>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation>&amp;Unohda kaikki tietueiden sivustokohtaiset asetukset</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>Käytät todella suurta lukua iteraatioiden määränä avaimen muunnoksen yhteydessä Argon2:lla.
-
-Jos pidät tämän arvon, tietokannan avauksessa voi kestää tunteja tai päiviä (tai jopa pidempään)!</translation>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation>Siirrä KeePassHTTP-attribuutit KeePassXC-Browser:in &amp;mukautettuihin tietoihin</translation>
     </message>
     <message>
-        <source>Understood, keep number</source>
-        <translation>Ymmärrän, säilytä numero</translation>
+        <source>Stored keys</source>
+        <translation>Tallennetut avaimet</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>Peruuta</translation>
+        <source>Remove</source>
+        <translation>Poista</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Iteraatioiden lukumäärä on liian pieni</translation>
+        <source>Delete the selected key?</source>
+        <translation>Poista valittu avain?</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>Käytät todella pientä lukua iteraatioiden määränä avaimen muunnoksessa AES-KDF:llä.
-
-Jos pidät tämän arvon, tietokanta voi olla liian helppo murtaa!</translation>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation>Haluatko poistaa valitun avaimen?
+Tämä voi estää yhteyden selainlaajennukseen.</translation>
     </message>
     <message>
-        <source>KDF unchanged</source>
-        <translation>Avainmuunnosfunktio ei ole muuttunut</translation>
+        <source>Key</source>
+        <translation>Avain</translation>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
-        <translation>Avaimen muunnos uusia KDF-parametreja käyttäen epäonnistui; KDF:ää ei muutettu.</translation>
+        <source>Value</source>
+        <translation>Arvo</translation>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation>Käytä selainintegraatiota käyttääksesi näitä asetuksia.</translation>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation>Unohda kaikki selaimet</translation>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation>Haluatko todella unohtaa kaikki selaimet?
+Tämä voi estää yhteyden selainlaajennukseen.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Avaimia ei löytynyt</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation>Jaettuja salausavaimia ei löytynyt KeePassXC:n asetuksista.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Poistettiin avaimet tietokannasta</translation>
     </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
-        <translation><numerusform>MiB</numerusform><numerusform> Mt</numerusform></translation>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation><numerusform>%n salausavain poistettiin onnistuneesti KeePassXC:n asetuksista.</numerusform><numerusform>%n salausavainta poistettiin onnistuneesti KeePassXC:n asetuksista.</numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation>Unohda kaikki sivustokohtaiset asetukset tietueilta</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>Haluatko todella unohtaa sivustokohtaiset asetuksista joka tietueelta?
+Pääsy tietueisiin evätään.</translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Poistetaan talletettuja oikeuksia…</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Keskeytä</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Poistetut käyttöoikeudet</translation>
     </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
-        <translation><numerusform>säie</numerusform><numerusform> säie(ttä)</numerusform></translation>
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation><numerusform>Poistettiin lupa %n tietueelta.</numerusform><numerusform>Poistettiin lupa %n tietueelta.</numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: Tietuetta käyttöoikeuksilla ei löytynyt!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Aktiivinen tietokanta ei sisällä yhtään tietuetta käyttöoikeuksien kanssa.</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation>Siirrä KeePassHTTP-attribuutit mukautettuihin tietoihin.</translation>
+    </message>
+    <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>Haluatko todella siirtää vanhat selainlaajennustiedot uuteen muotoon?
+Tämä on välttämätöntä selainintegraation yhteensopivuuden takaamiseksi.</translation>
     </message>
 </context>
 <context>
@@ -901,6 +1193,113 @@ Jos pidät tämän arvon, tietokanta voi olla liian helppo murtaa!</translation>
         <source>Parallelism:</source>
         <translation>Rinnakkaisuus:</translation>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation>Salauksen purkuun kulunut aika:</translation>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation>?? s</translation>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation>Muuta</translation>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation>100 ms</translation>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation>5 s</translation>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation>Korkeat arvot lupaavat parempaa suojaa, mutta tietokannan avaus voi kestää pidempään.</translation>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation>Tietokannan muoto:</translation>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation>Tämä on tärkeää vain, jos käytät tietokantaa muissa ohjelmissa.</translation>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation>KDBX 4.0 (suositeltu)</translation>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation>KDBX 3.1</translation>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation>muuttamaton</translation>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Iteraatioiden lukumäärä on liian suuri</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>Käytät todella suurta lukua iteraatioiden määränä avaimen muunnoksen yhteydessä Argon2:lla.
+
+Jos pidät tämän arvon, tietokannan avauksessa voi kestää tunteja tai päiviä (tai jopa pidempään)!</translation>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation>Ymmärrän, säilytä numero</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Peruuta</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Iteraatioiden lukumäärä on liian pieni</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>Käytät todella pientä lukua iteraatioiden määränä avaimen muunnoksessa AES-KDF:llä.
+
+Jos pidät tämän arvon, tietokanta voi olla liian helppo murtaa!</translation>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation>Avainmuunnosfunktio ei ole muuttunut</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation>Avaimen muunnos uusia KDF-parametreja käyttäen epäonnistui; KDF:ää ei muutettu.</translation>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation><numerusform>MiB</numerusform><numerusform>MiB</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation><numerusform>säie</numerusform><numerusform>säiettä</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation><numerusform>%1 ms</numerusform><numerusform>%1 ms</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -950,91 +1349,112 @@ Jos pidät tämän arvon, tietokanta voi olla liian helppo murtaa!</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>Juuri</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 -tietokanta</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Kaikki tiedostot</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Avaa tietokanta</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>Tiedostoa ei löytynyt!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Tietokannan avaaminen epäonnistui.</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>Tiedosto on avattu &quot;vain luku&quot;-tilassa.</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>Avaa CSV-tiedosto</translation>
+        <source>Add additional protection...</source>
+        <translation>Lisäsuoja...</translation>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>CSV-tiedosto</translation>
+        <source>No encryption key added</source>
+        <translation>Salausavainta ei ole lisätty</translation>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>Kaikki tiedostot(*)</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation>Ainakin yksi salausavain täytyy lisätä, jotta tietokanta pysyy suojassa!</translation>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Yhdistä tietokanta</translation>
+        <source>No password set</source>
+        <translation>Salasanaa ei ole asetettu</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Avaa KeePass 1 -tietokanta</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>VAROITUS! Et ole asettanut salasanaa. Tietokannan käyttöä ilman salasanaa ei suositella!
+
+Oletko varma, että haluat jatkaa ilman salasanaa?</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1 -tietokanta</translation>
+        <source>Unknown error</source>
+        <translation>Tuntematon virhe</translation>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>Sulje?</translation>
+        <source>Failed to change master key</source>
+        <translation>Pääsalasanan muuttaminen ei onnistunut</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; on muokkaustilassa.
-Hylkää muutokset ja sulje?</translation>
+        <source>Database Name:</source>
+        <translation>Tietokannan nimi:</translation>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>Tallenna muutokset?</translation>
+        <source>Description:</source>
+        <translation>Kuvaus:</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>Tietuetta &quot;%1&quot; muokattiin.
-Tallennetaanko muutokset?</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 -tietokanta</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Tietokannan kirjoitus levylle epäonnistui.</translation>
+        <source>All files</source>
+        <translation>Kaikki tiedostot</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Salasanat</translation>
+        <source>Open database</source>
+        <translation>Avaa tietokanta</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Tallenna tietokanta nimellä</translation>
+        <source>CSV file</source>
+        <translation>CSV-tiedosto</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>Yhdistä tietokanta</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Avaa KeePass 1 -tietokanta</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 -tietokanta</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1045,40 +1465,41 @@ Tallennetaanko muutokset?</translation>
         <translation>CSV-tiedoston kirjoitus levylle epäonnistui.</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>Uusi tietokanta</translation>
+        <source>Database creation error</source>
+        <translation>Tietokannan luomisvirhe</translation>
     </message>
     <message>
-        <source>locked</source>
-        <translation>lukittu</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>Luodulla tietokannalla ei ole avainta tai avainmuunnosfunktiota, joten sitä ei voida tallentaa.
+Tämä on selkeä virhe, joten ota yhteyttä kehittäjätiimiin.</translation>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>Lukitse tietokanta</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation>Tietokantatiedostoa ei ole olemassa tai siihen ei ole pääsyä.</translation>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>Tietokantaa ei voida lukita, sillä se on muokkaustilassa.
-Paina Peruuta jos haluat viimeistellä muutoksesi, muussa tapauksessa muutoksesi hylätään.</translation>
+        <source>Select CSV file</source>
+        <translation>Valitse CSV-tiedosto</translation>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>Tietokantaa on muokattu.
-Haluatko tallentaa tietokannan ennen sen lukitsemista?
-Jos et tallenna, muutokset hylätään.</translation>
+        <source>New Database</source>
+        <translation>Uusi tietokanta</translation>
     </message>
     <message>
-        <source>Disable safe saves?</source>
-        <translation>Ota turvallinen tallennus pois käytöstä?</translation>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Uusi tietokanta]</translation>
     </message>
     <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 on epäonnistunut useaan otteeseen tietokannan tallentamisessa. Tämä johtuu luultavasti tiedostojen synkronoinnista, joka pitää tiedostoa lukittuna.
-Ota turvallinen tallennus pois käytöstä ja yritä uudelleen?</translation>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Lukittu]</translation>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Vain luku]</translation>
     </message>
 </context>
 <context>
@@ -1088,37 +1509,13 @@ Ota turvallinen tallennus pois käytöstä ja yritä uudelleen?</translation>
         <translation>Etsitään...</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>Vaihda pääsalasana</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>Poista tietue?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>Haluatko varmasti poistaa tietueen &quot;%1&quot; lopullisesti?</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Poista tietueet?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Haluatko varmasti poistaa %1 tietuetta lopullisesti?</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Siirrä tietue roskakoriin?</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation>Haluatko varmasti siirtää tietueen &quot;%1&quot; roskakoriin?</translation>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Siirrä tietueet roskakoriin?</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation><numerusform>Haluatko varmasti siirtää %n tietueen roskakoriin?</numerusform><numerusform>Haluatko varmasti siirtää %n tietuetta roskakoriin?</numerusform></translation>
@@ -1136,18 +1533,10 @@ Ota turvallinen tallennus pois käytöstä ja yritä uudelleen?</translation>
         <translation>Muista valintani</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Poista ryhmä?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>Haluatko varmasti poistaa ryhmän &quot;%1&quot; lopullisesti?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Pääavaimen laskeminen ei onnistu</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>Ei nykyistä tietokantaa.</translation>
     </message>
@@ -1182,10 +1571,6 @@ Do you want to merge your changes?</source>
 Haluatko yhdistää muutoksesi?</translation>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>Uutta tietokantaa ei voitu avata, sillä tätä tietokantaa yritetään uudelleenavata samanaikaisesti.</translation>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>Tyhjennetäänkö roskakori?</translation>
     </message>
@@ -1193,88 +1578,107 @@ Haluatko yhdistää muutoksesi?</translation>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>Haluatko varmasti tyhjentää kaiken pysyvästi roskakorista?</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>Luo ajastetun kertakäyttöisen salasanan (TOTP) tunniste</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation><numerusform>Haluatko todella poistaa %n tietueen pysyvästi?</numerusform><numerusform>Haluatko todella poistaa %n tietuetta pysyvästi?</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation><numerusform>Poista tietue?</numerusform><numerusform>Poista tietueet?</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation><numerusform>Siirrä tietue roskakoriin?</numerusform><numerusform>Siirrä tietueet roskakoriin?</numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Sulje</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Tiedosto on avattu &quot;vain luku&quot;-tilassa.</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Yleistä</translation>
+        <source>Lock Database?</source>
+        <translation>Lukitse tietokanta?</translation>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Salasana</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation>Muokkaat tietuetta. Hylkää muutokset ja lukitse silti?</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>Tietuetta &quot;%1&quot; muokattiin.
+Tallennetaanko muutokset?</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>Vanhentumisaika</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation>Tietokantaa on muokattu.
+Tallenna muutokset?</translation>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Käyttäjätunnus</translation>
+        <source>Save changes?</source>
+        <translation>Tallenna muutokset?</translation>
     </message>
     <message>
-        <source>Autotype</source>
-        <translation>Automaattisyöttö</translation>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation>Uutta tietokantaa ei voitu avata automaattisen uudelleenlatauksen yhteydessä.
+Virhe: %1</translation>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>Hakeminen</translation>
+        <source>Disable safe saves?</source>
+        <translation>Ota turvallinen tallennus pois käytöstä?</translation>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>Attribuutit</translation>
+        <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 on epäonnistunut useaan otteeseen tietokannan tallentamisessa. Tämä johtuu luultavasti tiedostojen synkronoinnista, joka pitää tiedostoa lukittuna.
+Ota turvallinen tallennus pois käytöstä ja yritä uudelleen?</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Liitteet</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation>Tietokantaan kirjoittaminen epäonnistui.
+%1</translation>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Muistiinpanot</translation>
+        <source>Passwords</source>
+        <translation>Salasanat</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>Ikkuna</translation>
+        <source>Save database as</source>
+        <translation>Tallenna tietokanta nimellä</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>Sekvenssi</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 -tietokanta</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Etsi</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Tyhjennä</translation>
+        <source>Delete group</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Never</source>
-        <translation>Ei koskaan</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[SUOJATTU]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>Pois käytöstä</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Käytössä</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1348,22 +1752,10 @@ Haluatko yhdistää muutoksesi?</translation>
         <translation>Uusi attribuutti</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Vahvista poisto</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>Haluatko varmasti poistaa tämän attribuutin?</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[SUOJATTU]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation>Paina Paljasta näyttääksesi tai muokataksesi</translation>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>Huomenna</translation>
     </message>
@@ -1376,10 +1768,6 @@ Haluatko yhdistää muutoksesi?</translation>
         <translation><numerusform>%n kuukausi</numerusform><numerusform>%n kuukautta</numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 vuosi</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation>Käytä luotua salasanaa?</translation>
     </message>
@@ -1391,6 +1779,26 @@ Haluatko yhdistää muutoksesi?</translation>
         <source>Entry updated successfully.</source>
         <translation>Tietue päivitetty onnistuneesti.</translation>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation>Tietueella on tallentamattomia muutoksia</translation>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation>Uusi attribuutti %1</translation>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation>[SUOJATTU] Paina paljasta nähdäksesi tai muokataksesi</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n vuosi</numerusform><numerusform>%n vuotta</numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1636,6 +2044,81 @@ Haluatko yhdistää muutoksesi?</translation>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>Lomake</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Salasana:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1693,10 +2176,6 @@ Haluatko yhdistää muutoksesi?</translation>
         <translation>Faviconin noutaminen ei onnistu</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Vinkki: voit asettaa Googlen varajärjestelmäksi kohdassa Työkalut &gt; Asetukset &gt; Turvallisuus</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>Kuvat</translation>
     </message>
@@ -1705,14 +2184,6 @@ Haluatko yhdistää muutoksesi?</translation>
         <translation>Kaikki tiedostot</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Valitse kuva</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read icon</source>
-        <translation>Kuvaketta ei voida lukea</translation>
-    </message>
-    <message>
         <source>Custom icon already exists</source>
         <translation>Mukautettu kuvake on jo olemassa</translation>
     </message>
@@ -1721,8 +2192,36 @@ Haluatko yhdistää muutoksesi?</translation>
         <translation>Vahvista poisto</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>Tämä kuvake on %1 tietueen käytössä, ja se korvataan oletuskuvakkeella. Haluatko varmasti poistaa tämän kuvakkeen?</translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation>Mukautettu ikoni ladattu onnistuneesti</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>Vinkki: Voit asettaa DuckDuckGo:n ikonien lataukseen asetuksen Työkalut&gt;Asetukset&gt;Turvallisuus alta</translation>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation>Valitse kuva(t)</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation><numerusform>%1 ikoni kaikista (%n) ladattiin onnistuneesti</numerusform><numerusform>%1 ikonia kaikista (%n) ladattiin onnistuneesti</numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation>Yhtään ikonia ei ladattu</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation><numerusform>%n ikoni on jo tietokannassa</numerusform><numerusform>%n ikonia on jo tietokannassa</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation><numerusform>Seuraava ikoni epäonnistui:</numerusform><numerusform>Seuraavat ikonit epäonnistuivat:</numerusform></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>Ikonia käytetään %n tietueessa, ja se korvataan oletusikonilla. Oletko varma, että haluat poistaa sen?</numerusform><numerusform>Ikonia käytetään %n tietueessa, ja se korvataan oletusikonilla. Oletko varma, että haluat poistaa sen?</numerusform></translation>
     </message>
 </context>
 <context>
@@ -1773,9 +2272,8 @@ Tämä voi vikaannuttaa tietoa käyttävän liitännäisen.</translation>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation> - Klooni</translation>
+        <source>%1 - Clone</source>
+        <translation>%1 - Klooni</translation>
     </message>
 </context>
 <context>
@@ -1820,10 +2318,6 @@ Tämä voi vikaannuttaa tietoa käyttävän liitännäisen.</translation>
         <translation><numerusform>Haluatko varmasti poistaa &amp;n liitettä?</numerusform><numerusform>Haluatko varmasti poistaa %n liitettä?</numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Vahvista poisto</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>Tallenna liitteet</translation>
     </message>
@@ -1860,10 +2354,13 @@ Tämä voi vikaannuttaa tietoa käyttävän liitännäisen.</translation>
 %1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation>Vahvista poisto</translation>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>Tiedostojen avaaminen epäonnistui:
-%1</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1947,6 +2444,106 @@ Tämä voi vikaannuttaa tietoa käyttävän liitännäisen.</translation>
         <source>Attachments</source>
         <translation>Liitteet</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>Kyllä</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>Luo ajastetun kertakäyttöisen salasanan (TOTP) tunniste</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Sulje</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Yleistä</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Käyttäjätunnus</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Salasana</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Vanhentumisaika</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>Attribuutit</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Liitteet</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Muistiinpanot</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Automaattisyöttö</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Ikkuna</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Sekvenssi</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Hakeminen</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Etsi</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Tyhjennä</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Ei koskaan</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[SUOJATTU]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Käytössä</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Pois käytöstä</translation>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EntryView</name>
@@ -1985,6 +2582,19 @@ Tämä voi vikaannuttaa tietoa käyttävän liitännäisen.</translation>
         <source>Recycle Bin</source>
         <translation>Roskakori</translation>
     </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation>[tyhjä]</translation>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>HostInstaller</name>
@@ -1998,61 +2608,6 @@ Tämä voi vikaannuttaa tietoa käyttävän liitännäisen.</translation>
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>Pituus:</translation>
-    </message>
-    <message>
-        <source>Character Types</source>
-        <translation>Merkkityypit</translation>
-    </message>
-    <message>
-        <source>Upper Case Letters</source>
-        <translation>Isot kirjaimet</translation>
-    </message>
-    <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
-    </message>
-    <message>
-        <source>Lower Case Letters</source>
-        <translation>Pienet kirjaimet</translation>
-    </message>
-    <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
-    </message>
-    <message>
-        <source>Numbers</source>
-        <translation>Numerot</translation>
-    </message>
-    <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
-    </message>
-    <message>
-        <source>Special Characters</source>
-        <translation>Erikoismerkit</translation>
-    </message>
-    <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
-    </message>
-    <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Poissulje samannäköiset merkit</translation>
-    </message>
-    <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>Varmista, että salasana sisältää merkkejä jokaisesta ryhmästä</translation>
-    </message>
-    <message>
-        <source>Extended ASCII</source>
-        <translation>Laajennettu ASCII</translation>
-    </message>
-</context>
-<context>
     <name>KMessageWidget</name>
     <message>
         <source>&amp;Close</source>
@@ -2077,6 +2632,26 @@ Tämä voi vikaannuttaa tietoa käyttävän liitännäisen.</translation>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Väärä avain tai tietokanta on korruptoitunut.</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation>tietokannan otsaketiedot puuttuvat</translation>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation>Otsaketieto ei vastaa tiivistettä (hash)</translation>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>Virheellinen otsaketietojen id:n koko</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>Virhellinen otsaketietojen kentän koko</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>Virheellinen otsaketietojen sisällön koko</translation>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2236,10 +2811,6 @@ Tämä voi vikaannuttaa tietoa käyttävän liitännäisen.</translation>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation>Virheellinen salauksen uuid:n pituus</translation>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation>Salausta ei tueta</translation>
     </message>
@@ -2293,6 +2864,18 @@ Tämä muunnos toimii yhdensuuntaisesti. Et välttämättä saa enää tietokant
         <source>Unsupported KeePass 2 database version.</source>
         <translation>Ei-tuettu KeePass 2 -tietokantaversio.</translation>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation>Virheellinen salauksen uuid:n pituus: %1 (pituus=%2)</translation>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation>UUID:tä ei voitu jäsentää: %1</translation>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2365,10 +2948,6 @@ Tämä muunnos toimii yhdensuuntaisesti. Et välttämättä saa enää tietokant
         <translation>Historiaelementti eri uuid:llä</translation>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation>Tietueen merkkijonon salausta ei voitu purkaa</translation>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation>Itse valittu attribuutti on jo olemassa</translation>
     </message>
@@ -2417,6 +2996,14 @@ Tämä muunnos toimii yhdensuuntaisesti. Et välttämättä saa enää tietokant
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation>Binääriä ei voitu purkaa</translation>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation>XML-virhe:
+%1
+Rivi %2, sarake %3</translation>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2580,28 +3167,129 @@ Tämä muunnos toimii yhdensuuntaisesti. Et välttämättä saa enää tietokant
         <source>Invalid entry field type</source>
         <translation>Virheellinen tietueen kentän tyyppi</translation>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation>sisällön sijaintia ei voitu hakea</translation>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>Olemassa oleva yhden instanssin lukkotiedosto on virheellinen. Avataan uusi instanssi.</translation>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>Lukkotiedosto ei voitu luoda. Yhden instanssin tila otettu pois käytöstä.</translation>
+        <source>Import from</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Toinen KeePassXC-instanssi on jo käynnissä.</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Vakava virhe kryptografisia toimintoa testattaessa.</translation>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Virhe</translation>
+        <source>Key Component</source>
+        <translation>Avainkomponentti</translation>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation>Avainkomponentin kuvaus</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Peruuta</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation>Avainkomponentti asetettu, paina muokataksesi tai poistaaksesi</translation>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation>Lisätty %1</translation>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation>Muutettu %1</translation>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation>Poista %1</translation>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation>%1 asetettu, paina muokataksesi tai poistaaksesi</translation>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>Selaa</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Luo</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation>Avaintiedosto</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;Lisäturvaksi voit lisätä avaintiedoston, joka sisältää sattumanvaraista dataa.&lt;/p&gt;&lt;p&gt;Tämä tiedosto täytyy pitää salassa eikä sitä saa koskaan hävittää!&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation>Vanha avaintiedostomuoto</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>Käytät vanhaa avaintiedoston muotoa joka ei ole välttämättä tuettu tulevaisuudessa.
+
+Ole hyvä ja mene pääsalasanan asetuksiin ja luo uusi avaintiedosto.</translation>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation>Avaintiedostoa &apos;%1&apos; ei voitu avata
+Viesti: %2</translation>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Avaintiedostot</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Kaikki tiedostot</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Luo avaintiedosto...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation>Virhe luotaessa avaintiedostoa</translation>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation>Avaintiedostoa ei voitu luoda: %1</translation>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Valitse avaintiedosto</translation>
     </message>
 </context>
 <context>
@@ -2615,10 +3303,6 @@ Tämä muunnos toimii yhdensuuntaisesti. Et välttämättä saa enää tietokant
         <translation>Viimeisimmät tietokannat</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Tuo</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation>&amp;Ohje</translation>
     </message>
@@ -2627,14 +3311,6 @@ Tämä muunnos toimii yhdensuuntaisesti. Et välttämättä saa enää tietokant
         <translation>Ti&amp;etueet</translation>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>Kopioi att&amp;ribuutti leikepöydälle</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation>Ajastettu kertakäyttöinen salasana</translation>
-    </message>
-    <message>
         <source>&amp;Groups</source>
         <translation>Ryhmät</translation>
     </message>
@@ -2663,30 +3339,10 @@ Tämä muunnos toimii yhdensuuntaisesti. Et välttämättä saa enää tietokant
         <translation>&amp;Sulje tietokanta</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>&amp;Uusi tietokanta</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>Yhdistä KeePassXC-tietokannasta</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>Lisää &amp;tietue</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>Näytä/&amp;muokkaa tietuetta</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>&amp;Poista tietue</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>Lisää uusi &amp;ryhmä</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>Muokkaa r&amp;yhmää</translation>
     </message>
@@ -2699,14 +3355,6 @@ Tämä muunnos toimii yhdensuuntaisesti. Et välttämättä saa enää tietokant
         <translation>Ta&amp;llenna tietokanta nimellä...</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Vaih&amp;da pääsalasana...</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>Tietokannan &amp;asetukset</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>Tietokannan asetukset</translation>
     </message>
@@ -2715,10 +3363,6 @@ Tämä muunnos toimii yhdensuuntaisesti. Et välttämättä saa enää tietokant
         <translation>&amp;Kloonaa tietue</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>&amp;Etsi</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>Kopioi käyttäjä&amp;tunnus</translation>
     </message>
@@ -2727,10 +3371,6 @@ Tämä muunnos toimii yhdensuuntaisesti. Et välttämättä saa enää tietokant
         <translation>Kopioi käyttäjätunnus leikepöydälle</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>Kopioi &amp;salasana</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>Kopioi salasana leikepöydälle</translation>
     </message>
@@ -2743,14 +3383,6 @@ Tämä muunnos toimii yhdensuuntaisesti. Et välttämättä saa enää tietokant
         <translation>Salasanageneraattori</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation>Suorita automaattisyöttö</translation>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>Avaa &amp;URL</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>&amp;Lukitse tietokannat</translation>
     </message>
@@ -2783,22 +3415,6 @@ Tämä muunnos toimii yhdensuuntaisesti. Et välttämättä saa enää tietokant
         <translation>&amp;Vie CSV-tiedostoon...</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Tuo KeePass 1 -tietokanta...</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>Tuo CSV-tiedosto...</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Ko&amp;rjaa tietokanta...</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>Näytä TOTP</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>Aseta TOTP...</translation>
     </message>
@@ -2819,14 +3435,6 @@ Tämä muunnos toimii yhdensuuntaisesti. Et välttämättä saa enää tietokant
         <translation>Pääsyvirhe asetustiedostoon %1</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Vaikuttaa siltä, että käytät KeePassHTTP:tä selaimesi kanssa. Tämä ominaisuus on vanhentunut ja tuki sille poistetaan tulevaisuudessa.&lt;br&gt;Ole hyvä ja vaihda selainlaajennus KeePassXC-Browser:iin! Mikäli tarvitset apua sen käyttöönottoon, vieraile &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;oppaassamme&lt;/a&gt;(varoitus %1/3).&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>vain-luku</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Asetukset</translation>
     </message>
@@ -2839,36 +3447,278 @@ Tämä muunnos toimii yhdensuuntaisesti. Et välttämättä saa enää tietokant
         <translation>Sulje KeePassXC</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 -tietokanta</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Kosketa YubiKeyssa olevaa painiketta!</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Kaikki tiedostot</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation>VAROITUS: Käytät epävakaata KeePassXC-julkaisua!
+On mahdollista, että tietokantasi korruptoituu. Pidä huolta sen varmuuskopiosta.
+Tätä versiota ei ole tarkoitettu päivittäiseen käyttöön.</translation>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Avaa tietokanta</translation>
+        <source>&amp;Donate</source>
+        <translation>&amp;Lahjoita</translation>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Tallenna korjattu tietokanta</translation>
+        <source>Report a &amp;bug</source>
+        <translation>Ilmoita &amp;virheestä</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Tietokannan kirjoitus levylle epäonnistui.</translation>
+        <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>VAROITUS: Qt-versiosi voi aiheuttaa KeePassXC:n kaatumisen näytön näppäimistöllä!
+Suosittelemme, että käytät AppImagea, jonka voit hakea lataussivustoltamme.</translation>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Kosketa YubiKeyssa olevaa painiketta!</translation>
+        <source>&amp;Import</source>
+        <translation>&amp;Tuo</translation>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
-        <translation>VAROITUS: Käytät epävakaata KeePassXC-julkaisua!
-On mahdollista, että tietokantasi korruptoituu. Pidä huolta sen varmuuskopiosta.
-Tätä versiota ei ole tarkoitettu päivittäiseen käyttöön.</translation>
+        <source>Copy att&amp;ribute...</source>
+        <translation>Kopioi att&amp;ribuutti...</translation>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation>TOTP...</translation>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation>&amp;Uusi tietokanta</translation>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation>Luo uusi tietokanta</translation>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation>&amp;Yhdistä tietokannasta...</translation>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation>Yhdistä toisesta KDBX-tietokannasta</translation>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation>Uusi &amp;tietue</translation>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation>Lisää uusi tietue</translation>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation>&amp;Muokkaa tietuetta</translation>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation>Katso tai muokkaa tietuetta</translation>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation>Uusi &amp;ryhmä</translation>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation>Lisää uusi ryhmä</translation>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation>Muuta &amp;pääsalasanaa</translation>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation>&amp;Tietokannan asetukset</translation>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation>Kopioi &amp;salasana</translation>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation>Suorita &amp;automaattitäydennys</translation>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation>&amp;Avaa URL</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation>KeePass 1 -tietokanta...</translation>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation>Tuo KeePass 1 -tietokanta</translation>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation>CSV-tiedosto...</translation>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation>Tuo CSV-tiedosto</translation>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation>Näytä TOTP...</translation>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation>Näytä TOTP QR-koodi...</translation>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation>Luodaan puuttunutta %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation>Uudelleensijoitetaan %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation>Ylikirjoitetaan %1 [%2]</translation>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation>vanhempi tietue yhdistetty tietokannasta &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation>Lisätään varmuuskopio vanhemmalle kohteelle %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation>Lisätään varmuuskopio vanhemmalle lähteelle %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation>Uudelleensijoitetaan vanhempi kohdetietue uuden lähteen päälle %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation>Uudelleensijoitetaan vanhempi lähdetietue uuden kohteen päälle %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation>Synkronoidaan uudemmasta lähteestä %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation>Synkronoidaan vanhemmasta lähteestä %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation>Poistetaan lasta %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation>Poistetaan orpoa %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation>Muutettiin poistettuja kohteita</translation>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation>Lisätään puuttuva ikoni %1</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation>Luo uusi KeePassXC-tietokanta...</translation>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Juuri</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>Ohjattu sivu</translation>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation>&amp;Salausasetukset</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>Täällä voit säätää tietokannan salausasetuksia. Voit muokata niitä myöhemmin uudelleen.</translation>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Lisäasetukset</translation>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation>Yksinkertaiset asetukset</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <translation>Salausasetukset</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>Täällä voit säätää tietokannan salausasetuksia. Voit muokata niitä myöhemmin uudelleen.</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation>Tietokannan pääsalasana</translation>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation>Pääsalasana jonka vain sinä tiedät suojaa tietokantaasi.</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <translation>Yleiset tietokannan tiedot</translation>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation>Ole hyvä ja täytä tietokantasi nimi ja vapaaehtoinen kuvaus:</translation>
     </message>
 </context>
 <context>
@@ -2971,125 +3821,34 @@ Tätä versiota ei ole tarkoitettu päivittäiseen käyttöön.</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation>Dialogi</translation>
-    </message>
-    <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>Tämä vaaditaan, jotta tietokantoja voidaan käyttää ChromeIPassilla or PassIFoxilla</translation>
-    </message>
-    <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>Ota käyttöön KeePassHTTP-palvelin</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Yleistä</translation>
-    </message>
-    <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>Nä&amp;ytä ilmoitus kun tilitietoja pyydetään</translation>
-    </message>
-    <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>Palauta vain parhaat osumat tietystä osoitteesta verkkotunnuksen kaikkien osumien sijasta</translation>
-    </message>
-    <message>
-        <source>&amp;Return only best matching entries</source>
-        <translation>&amp;Palauta vain parhaiten vastaavat tietueet</translation>
-    </message>
-    <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Pyyd&amp;ä tietokannan lukituksen avaamista jos se on lukittu</translation>
-    </message>
-    <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation>Vain tietueet samalla skeemalla (http://, https://, ftp://, ...) palautetaan.</translation>
-    </message>
-    <message>
-        <source>&amp;Match URL schemes</source>
-        <translation>&amp;Sovita verkko-osoitteen kaavaan</translation>
-    </message>
-    <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Järjestä sopivat tietueet &amp;käyttäjätunnuksen mukaan</translation>
-    </message>
-    <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Järjestä sopivat tietueet &amp;nimen mukaan</translation>
-    </message>
-    <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>&amp;Poista kaikki jaetut salausavaimet aktiivisesta tietokannasta</translation>
-    </message>
-    <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>&amp;Poista kaikki jaetut salausavaimet aktiivisesta tietokannasta</translation>
-    </message>
-    <message>
-        <source>Password Generator</source>
-        <translation>Salasanageneraattori</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Lisäasetukset</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Salli aina &amp;pääsy tietueisiin</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Salli aina tietueiden p&amp;äivittäminen</translation>
-    </message>
-    <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>Vain valittu tietokanta tulee olla yhdistetty asiakkaan kanssa.</translation>
-    </message>
-    <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>E&amp;tsi kaikista avatuista tietokannoista vastaavia tietueita</translation>
-    </message>
-    <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>Automaattinen lisäjonokenttien luonti tai päivittäminen ei ole tuettu</translation>
-    </message>
-    <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>Palauta lisämerkkijonokentät jotka alkavat &quot;KPH: &quot;</translation>
-    </message>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP-portti:</translation>
+        <source>Enter password:</source>
+        <translation>Syötä salasana:</translation>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Oletusportti: 19455</translation>
+        <source>Confirm password:</source>
+        <translation>Vahvista salasana:</translation>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC kuuntelee tätä porttia osoitteessa 127.0.0.1</translation>
+        <source>Password</source>
+        <translation>Salasana</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;Varoitus:&lt;/b&gt; Seuraavat valinnat voivat olla vaarallisia!</translation>
+        <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;Salasana on kaikkein tärkein asia tietokannan suojauksessa.&lt;/p&gt;&lt;p&gt;Hyvät salasanat ovat pitkiä ja uniikkeja. KeePassXC voi luoda sellaisen sinulle.&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;KeePassHTTP on vanhennettu ja se poistetaan tulevaisuudessa.&lt;br&gt;Vaihda KeePassXC-Browseriin! Ohjeita siirtymiseen on tarjolla &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;siirtymäohjeessa&lt;/a&gt;.&lt;/p&gt;</translation>
+        <source>Password cannot be empty.</source>
+        <translation>Salasana ei voi olla tyhjä.</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Ei voida sitoutua etuoikeutettuihin portteihin</translation>
+        <source>Passwords do not match.</source>
+        <translation>Salasanat eivät ole samoja.</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Ei voida sitoutua etuoikeutettuihin portteihin, jotka ovat alle 1024!
-Käytetään oletusporttia 19455.</translation>
+        <source>Generate master password</source>
+        <translation>Luo pääsalasana</translation>
     </message>
 </context>
 <context>
@@ -3160,18 +3919,10 @@ Käytetään oletusporttia 19455.</translation>
         <translation>Sanalista:</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Sanamäärä:</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>Sanaerotin:</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>Luo</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Kopioi</translation>
     </message>
@@ -3184,10 +3935,6 @@ Käytetään oletusporttia 19455.</translation>
         <translation>Sulje</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>Käytä</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>Entropia: %1 bit</translation>
     </message>
@@ -3215,6 +3962,171 @@ Käytetään oletusporttia 19455.</translation>
         <comment>Password quality</comment>
         <translation>Erinomainen</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation>Laajennettu ASCII</translation>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation>Vaihda kehittyneeseen tilaan</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Lisäasetukset</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation>Isot kirjaimet A:sta F:ään</translation>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation>Pienet kirjaimet A:sta F:ään</translation>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation>Sulut</translation>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation>{[(</translation>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation>Välimerkit</translation>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation>.,:;</translation>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation>Lainausmerkit</translation>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation>&quot; &apos;</translation>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation>Matemaattiset</translation>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation>&lt;*+!?=</translation>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation>Viivat</translation>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation>Erikoismerkit</translation>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation>#$%&amp;&amp;@^`~</translation>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation>Vaihda yksinkertaiseen tilaan</translation>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation>Yksinkertainen</translation>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation>Kirjaimet joita ei käytetä salasanan muodostukseen</translation>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation>Älä sisällytä:</translation>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation>Lisää heksakoodia sisältämättömät kirjaimet &quot;älä sisällytä&quot; -listaan</translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation>Heksa</translation>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation>Poissuljetut kirjaimet: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</translation>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation>Sanojen &amp;lukumäärä:</translation>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation>Luo uudelleen</translation>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Poista</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Poista</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Kytke pois päältä</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3235,34 +4147,18 @@ Käytetään oletusporttia 19455.</translation>
         <translation>Viestin salauksen purkaminen ei onnistu</translation>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
-        <translation>Aikakatkaisu tai yhteys KeePassXC:hen ei onnistu</translation>
-    </message>
-    <message>
         <source>Action cancelled or denied</source>
         <translation>Toiminto peruttiin tai estettiin</translation>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation>Viestin salauksen purkaminen ei onnistu tai julkista avainta ei löydy. Onko Native Messaging käytössä KeePassXC:ssä?</translation>
-    </message>
-    <message>
         <source>KeePassXC association failed, try again</source>
         <translation>Liittäminen KeePassXC:hen epäonnistui, yritä uudelleen</translation>
     </message>
     <message>
-        <source>Key change was not successful</source>
-        <translation>Avainvaihto ei onnistunut</translation>
-    </message>
-    <message>
         <source>Encryption key is not recognized</source>
         <translation>Salausavainta ei tunnistettu</translation>
     </message>
     <message>
-        <source>No saved databases found</source>
-        <translation>Tallennettuja tietokantoja ei löytynyt</translation>
-    </message>
-    <message>
         <source>Incorrect action</source>
         <translation>Virheellinen toiminto</translation>
     </message>
@@ -3388,10 +4284,6 @@ Käytetään oletusporttia 19455.</translation>
         <translation>Syötä salasana avataksesi %1:</translation>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation>Avaintiedoston %1 lataaminen epäonnistui : %2</translation>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3476,12 +4368,6 @@ Käytettävissä olevat komennot:
         <translation>virhe laitteelta luettaessa</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>tiedosto on tyhjä !
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation>Viallinen merkkijono</translation>
     </message>
@@ -3490,30 +4376,6 @@ Käytettävissä olevat komennot:
         <translation>lainausmerkki puuttuu lopusta</translation>
     </message>
     <message>
-        <source>AES: 256-bit</source>
-        <translation>AES: 256-bit</translation>
-    </message>
-    <message>
-        <source>Twofish: 256-bit</source>
-        <translation>Twofish: 256-bit</translation>
-    </message>
-    <message>
-        <source>ChaCha20: 256-bit</source>
-        <translation>ChaCha20: 256-bit</translation>
-    </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – suositeltu)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 4)</source>
-        <translation>AES-KDF (KDBX 4)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 3.1)</source>
-        <translation>AES-KDF (KDBX 3.1)</translation>
-    </message>
-    <message>
         <source>Group</source>
         <translation>Ryhmä</translation>
     </message>
@@ -3542,10 +4404,6 @@ Käytettävissä olevat komennot:
         <translation>Luotu</translation>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
-        <translation>Vanha selainintegraatio</translation>
-    </message>
-    <message>
         <source>Browser Integration</source>
         <translation>Selainintegraatio</translation>
     </message>
@@ -3574,10 +4432,6 @@ Käytettävissä olevat komennot:
         <translation>Sanamäärä noppaware-salalauseelle.</translation>
     </message>
     <message>
-        <source>count</source>
-        <translation>määrä</translation>
-    </message>
-    <message>
         <source>Wordlist for the diceware generator.
 [Default: EFF English]</source>
         <translation>Sanalista noppaware-luojalle.
@@ -3588,28 +4442,438 @@ Käytettävissä olevat komennot:
         <translation>Luo uusi satunnainen salasana.</translation>
     </message>
     <message>
-        <source>Length of the generated password.</source>
-        <translation>Luodun salasanan pituus.</translation>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
-        <translation>Käytä pieniä kirjaimia luodussa salasanassa.</translation>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
-        <translation>Käytä isoja kirjaimia luodussa salasanassa.</translation>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
-        <translation>Käytä numeroita luodussa salasanassa.</translation>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
-        <translation>Käytä erikoismerkkejä luodussa salasanassa.</translation>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
-        <translation>Käytä laajennettua ASCII-merkistöä luodussa salasanassa.</translation>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation>määrä</translation>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>Tiedostoa %1 ei ole.</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Tiedostoa %1 ei voitu avata.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256-bit</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256-bit</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256-bit</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – suositeltu)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>Poista tietue tietokannasta.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>Poistettavan tietueen polku.</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>Olemassa oleva yhden instanssin lukkotiedosto on virheellinen. Avataan uusi instanssi.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Lukkotiedosto ei voitu luoda. Yhden instanssin tila otettu pois käytöstä.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - järjestelmäriippumaton salasanojen hallintasovellus</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>avattavien salasanatietokantojen tiedostonimet (*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>polku mukautettuun asetustiedostoon</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>tietokannan avaintiedosto</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>lue tietokannan salasana stdin:istä</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation>Ylemmän ikkunan kahva</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Toinen KeePassXC-instanssi on jo käynnissä.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Vakava virhe kryptografisia toimintoa testattaessa.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Virhe</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation>Tietokannan salasana:</translation>
     </message>
 </context>
 <context>
@@ -3647,11 +4911,97 @@ Käytettävissä olevat komennot:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
+    <message>
+        <source>Agent connection failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <source>Search...</source>
-        <translation>Etsi...</translation>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
     <message>
         <source>Search</source>
         <translation>Etsi</translation>
@@ -3661,314 +5011,316 @@ Käytettävissä olevat komennot:
         <translation>Tyhjennä</translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Kirjainkoko on merkitsevä</translation>
-    </message>
-    <message>
         <source>Limit search to selected group</source>
         <translation>Rajoita haku valittuun ryhmään</translation>
     </message>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Service</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC: Uusi avaimenliittämispyyntö</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation>Olet saanut avainlittämispyynnön yllä olevalle avaimelle
-Jos haluat antaa sille pääsyoikeuden KeePassXC-tietokantaasi,
-anna tunnisteelle nimi ja hyväksy.</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: Korvataanko olemassa oleva avain?</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Jaettu salausavain nimeltä &quot;%1&quot; on jo olemassa.
-Haluatko korvata sen?</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: Päivitä tietue</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Haluatko päivittää tiedot osoitteesta %1 - %2?</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: tietokanta lukittu!</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Aktiivinen tietokanta on lukittu!
-Avaa valittu tietokanta tai valitse toinen avattu tietokanta.</translation>
+        <source>Key:</source>
+        <translation>Avain:</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Poistettiin avaimet tietokannasta</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation><numerusform>Poistettiin %n salausavain(ta) KeePassX/Http-asetuksista.</numerusform><numerusform>Poistettiin %n salausavain(ta) KeePassX/Http-asetuksista.</numerusform></translation>
+        <source>Generate</source>
+        <translation>Luo</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Avaimia ei löytynyt</translation>
+        <source>Import</source>
+        <translation>Tuo</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>Jaettuja salausavaimia ei löytynyt KeePassHttp-asetuksista.</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Asetukset eivät ole käytettävissä!</translation>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>Aktiivinen tietokanta ei sisällä tietuetta KeePassHttp-asetuksilla.</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>Poistetaan talletettuja oikeuksia...</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>Keskeytä</translation>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Poistetut käyttöoikeudet</translation>
+        <source>Remove</source>
+        <translation>Poista</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation><numerusform>Poistettiin käyttöoikeudet %1:n tietueen tiedoista.</numerusform><numerusform>Poistettiin käyttöoikeudet %1:n tietueen tiedoista.</numerusform></translation>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Tietuetta käyttöoikeuksilla ei löytynyt!</translation>
+        <source>Status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Aktiivinen tietokanta ei sisällä yhtään tietuetta käyttöoikeuksien kanssa.</translation>
+        <source>Fingerprint</source>
+        <translation>Sormenjälki</translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
-        <translation>Sovelluksen asetukset</translation>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Yleistä</translation>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>Turvallisuus</translation>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>Pääsyvirhe asetustiedostoon %1</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>Perusasetukset</translation>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Käynnistä vain yksi KeePassXC-instanssi</translation>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>Muista viimeisimmät tietokannat</translation>
+        <source>All files</source>
+        <translation>Kaikki tiedostot</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Muista viimeisimmät avaintiedostot ja tietoturva-avainlaitteet (donglet)</translation>
+        <source>Select path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Lataa edelliset tietokannat käynnistäessä</translation>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>Tallenna automaattisesti suljettaessa</translation>
+        <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"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>Tallenna automaattisesti jokaisen muutoksen jälkeen</translation>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Lataa tietokanta automaattisesti uudelleen jos tietokantaa muokattiin muualla</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>Pienennä ikkuna kopioidessa leikepöydälle</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Pienennä ikkuna ohjelman käynnistyessä</translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>Käytä ryhmän kuvaketta tietuetta luodessa</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Älä merkitse tietokantaa muokatuksi mikäli tietueet eivät muutu (esim. ryhmien laajentamisen yhteydessä)</translation>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
-        <translation>Piilota tarkemmat tiedot</translation>
+        <source>Never</source>
+        <translation>Ei koskaan</translation>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>Näytä ilmoitusalueen kuvake</translation>
+        <source>Always</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>Piiloita pienennetty ikkuna ilmoitusalueelle</translation>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
-        <translation>Piiloita ikkuna ilmoitusalueelle sulkemisen sijaan</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
-        <translation>Tumma ilmoitusalueen kuvake</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Kieli</translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Automaattisyöttö</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>Tietue on sopiva, jos sen nimi sisältyy kohdeikkunan otsikkoon yleisessä automaattisyötössä</translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>Tietue on sopiva, jos sen osoite sisältyy kohdeikkunan otsikkoon yleisessä automaattisyötössä</translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation>Kysy aina ennen automaattisyötön käyttämistä</translation>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Yleisen automaattisyötön pikanäppäin</translation>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>Automaattisyötön viive</translation>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation> ms</translation>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
-        <translation>Käynnistys</translation>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
-        <translation>Tiedostohallinta</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation>Tallenna tietokannat turvallisesti (voi olla epäyhteensopiva Dropboxin tmv. kanssa)</translation>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
-        <translation>Ota tietokannasta varmuuskopio ennen tallentamista</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
-        <translation>Tietueiden hallinta</translation>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Yleistä</translation>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
-        <translation>Aikakatkaisut</translation>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>Tyhjennä leikepöytä kun on kulunut</translation>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> s</translation>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>Lukitse tietokannat jos on oltu joutilaana</translation>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Mukavuus</translation>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Lukitse tietokannat kun istunto lukitaan tai kansi suljetaan</translation>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>Lukitse tietokanta ikkunan pienennyksen jälkeen</translation>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>TotpDialog</name>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>Älä vaadi salasanan toistoa jos salasana on näkyvillä</translation>
+        <source>Timed Password</source>
+        <translation>Ajastettu salasana</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Näytä salasanat oletuksena selkokielisenä</translation>
+        <source>000000</source>
+        <translation>000000</translation>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
-        <translation>Piilota salasanat esikatselussa</translation>
+        <source>Copy</source>
+        <translation>Kopioi</translation>
+    </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
     <message>
-        <source>Hide entry notes by default</source>
-        <translation>Piilota tietueiden muistiinpanot</translation>
+        <source>Copy</source>
+        <translation>Kopioi</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>Yksityisyys</translation>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>Käytä Googlea varajärjestelmänä verkkosivustojen kuvakkeiden latausta varten</translation>
+        <source>There was an error creating the QR code.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
-        <translation>Uudelleenlukitse aikaisemmin lukittu tietokanta automaattisyötön jälkeen</translation>
+        <source>Closing in %1 seconds.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation>Määritä TOTP</translation>
@@ -3990,59 +5342,84 @@ Avaa valittu tietokanta tai valitse toinen avattu tietokanta.</translation>
         <translation>Käytä mukautettuja asetuksia</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>Huomautus: Muuta näitä asetuksia vain, jos tiedät mitä olet tekemässä.</translation>
+        <source>Custom Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Time step:</source>
         <translation>Aikaväli:</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8 numeroa</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> s</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>Koodikoko:</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6 numeroa</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>Koodikoko:</translation>
+        <source>7 digits</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> s</translation>
+        <source>8 digits</source>
+        <translation>8 numeroa</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>Ajastettu salasana</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Kopioi</translation>
+        <source>Close</source>
+        <translation>Sulje</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>Vanhenee</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>sekuntia</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>Avaa tietokannan lukitus</translation>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4077,42 +5454,26 @@ Avaa valittu tietokanta tai valitse toinen avattu tietokanta.</translation>
     </message>
 </context>
 <context>
-    <name>main</name>
-    <message>
-        <source>Remove an entry from the database.</source>
-        <translation>Poista tietue tietokannasta.</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>Tietokannan polku.</translation>
-    </message>
-    <message>
-        <source>Path of the entry to remove.</source>
-        <translation>Poistettavan tietueen polku.</translation>
-    </message>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - järjestelmäriippumaton salasanojen hallintasovellus</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>avattavien salasanatietokantojen tiedostonimet (*.kdbx)</translation>
+        <source>Refresh</source>
+        <translation>Päivitä</translation>
     </message>
     <message>
-        <source>path to a custom config file</source>
-        <translation>polku mukautettuun asetustiedostoon</translation>
+        <source>YubiKey Challenge-Response</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>tietokannan avaintiedosto</translation>
+        <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"/>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>lue tietokannan salasana stdin:istä</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Parent window handle</source>
-        <translation>Ylemmän ikkunan kahva</translation>
+        <source>No YubiKey inserted.</source>
+        <translation>YubiKey ei ole kiinni laittessa.</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_fr.ts b/share/translations/keepassx_fr.ts
index 8017f9855..a1cbbf0a8 100644
--- a/share/translations/keepassx_fr.ts
+++ b/share/translations/keepassx_fr.ts
@@ -38,12 +38,6 @@
         <translation>Copier dans le presse-papiers</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>Version %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>Révision : %1</translation>
     </message>
@@ -76,35 +70,48 @@ Noyau : %3 %4</translation>
         <translation>L’équipe de KeePassXC remercie tout particulièrement debfx pour la création du KeePassX original.</translation>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
-        <translation>Type version : %1
-</translation>
+        <source>Version %1</source>
+        <translation>Version %1</translation>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>Confirmer l’accès à KeePassXC HTTP</translation>
+        <source>Build Type: %1</source>
+        <translation>Type de Version : %1</translation>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>Mémoriser ce choix</translation>
+        <source>Auto-Type</source>
+        <translation>Saisie automatique</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Autoriser</translation>
+        <source>Browser Integration</source>
+        <translation>Intégration aux navigateurs</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>Refuser</translation>
+        <source>SSH Agent</source>
+        <translation>Agent SSH</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>%1 a demandé l’accès aux mots de passe pour les éléments suivants.
-Veuillez indiquer si vous souhaitez autoriser l’accès.</translation>
+        <source>YubiKey</source>
+        <translation>YubiKey</translation>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation>TouchID</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Aucun</translation>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -113,6 +120,277 @@ Veuillez indiquer si vous souhaitez autoriser l’accès.</translation>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>Activer l’agent SSH (redémarrage nécessaire)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Paramètres de l’application</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Général</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Sécurité</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Erreur d’accès au fichier de configuration %1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Paramètres de base</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>Démarrage</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Démarrer une seule instance de KeePassXC</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Se souvenir des dernières bases de données</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Mémoriser les derniers fichiers-clés et les clés électroniques de sécurité</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Charger les bases de données précédentes au démarrage</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>Minimiser la fenêtre lors du démarrage de l’application</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>Gestion de fichiers</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation>Enregistrer en toute sécurité les fichiers de base de données (peut être incompatible avec Dropbox, etc.)</translation>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation>Sauvegarder le fichier de base de données avant d’enregistrer</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Enregistrer automatiquement après chaque changement</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Enregistrer automatiquement en quittant</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Ne pas indiquer la base de données comme modifiée pour les changements hors-données (par exemple : groupes développés)</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Recharger automatiquement la base de données quand celle-ci est modifiée depuis l’extérieur</translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>Gestion des entrées</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>Utiliser l’icône de groupe à la création d’une entrée</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Minimiser après avoir copié dans le presse-papiers</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation>Masquer le panneau de prévisualisation de l&apos;entrée</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Général</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation>Cacher la barre d&apos;outils (icônes)</translation>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation>Réduire au lieu de quitter l&apos;application</translation>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Afficher une icône dans la zone de notification</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>Icône sombre dans la zone de notification</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Cacher la fenêtre dans la zone de notification une fois minimisée</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Langue</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Saisie automatique</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>Utiliser le titre de l’entrée dans la correspondance des fenêtres pour la saisie automatique globale.</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>Utiliser l’URL de l’entrée dans la correspondance des fenêtres pour la saisie automatique globale.</translation>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>Toujours demander avant de procéder à une saisie automatique</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Raccourci de la saisie automatique</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation>Délai de remplissage de la saisie automatique</translation>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation>ms</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation>Délai de démarrage de la saisie automatique</translation>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>Expirations</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>Vider le presse-papiers après</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> s</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>Verrouiller les bases de données après une inactivité de</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation>Oublier TouchID après inactivité</translation>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>Commodités</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Verrouiller les bases de données quand la session est verrouillée ou l’écran rabattu</translation>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation>Oublier TouchID lorsque la session est verrouillée ou le capot fermé</translation>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>Verrouiller les bases de données lorsque la fenêtre est minimisée</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation>Verrouiller à nouveau la base de données précédemment verrouillée après avoir effectué la saisie automatique</translation>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>Ne pas demander de répéter le mot de passe lorsque celui-ci est visible</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation>Ne pas cacher les mots de passe pendant leur modification</translation>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation>Ne pas utiliser d’élément de substitution pour des champs de mot de passe vides&lt;br&gt;&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation>Masquer les mots de passe dans le panneau de prévisualisation</translation>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>Masquer les notes des entrées par défaut</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>Confidentialité</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation>Utiliser DuckDuckGo en second recours pour télécharger les icônes des sites Web</translation>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -216,6 +494,27 @@ Veuillez indiquer si vous souhaitez autoriser l’accès.</translation>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation>Enregistrer l&apos;entrée avec KeePassXC-Browser</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuler</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation>Plusieurs bases de données sont ouvertes.
+Veuillez sélectionner la base de donnée souhaitée pour enregistrer les identifiants.</translation>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -289,14 +588,6 @@ Veuillez indiquer si vous souhaitez autoriser l’accès.</translation>
         <translation>Trier par nom d’&amp;utilisateur les identifiants correspondants</translation>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>&amp;Déconnecter tous les navigateurs</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>Oublier toutes les autorisations accordées</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>Avancé</translation>
     </message>
@@ -321,7 +612,7 @@ Veuillez indiquer si vous souhaitez autoriser l’accès.</translation>
     </message>
     <message>
         <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>La création ou la mise a jour automatique ne sont pas pris en charge pour les champs de chaînes de caractères !</translation>
+        <translation>La création ou la mise a jour automatique ne sont pas pris en charge pour les champs de chaînes de caractères !</translation>
     </message>
     <message>
         <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
@@ -337,7 +628,7 @@ Veuillez indiquer si vous souhaitez autoriser l’accès.</translation>
     </message>
     <message>
         <source>Support a proxy application between KeePassXC and browser extension.</source>
-        <translation>Supporter une application proxy entre KeePassXC et l’extension pour navigateur web.</translation>
+        <translation>Supporter une application proxy entre KeePassXC et l’extension pour navigateur web</translation>
     </message>
     <message>
         <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
@@ -362,14 +653,6 @@ Veuillez indiquer si vous souhaitez autoriser l’accès.</translation>
         <translation>&lt;b&gt;Avertissement :&lt;/b&gt; Les options suivantes peuvent être dangereuses !</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>Fichiers exécutables (*.exe);;Tous les fichiers (*.*)</translation>
-    </message>
-    <message>
-        <source>Executable Files (*)</source>
-        <translation>Fichiers exécutables (*)</translation>
-    </message>
-    <message>
         <source>Select custom proxy location</source>
         <translation>Sélectionner un proxy personnalisé</translation>
     </message>
@@ -377,6 +660,31 @@ Veuillez indiquer si vous souhaitez autoriser l’accès.</translation>
         <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
         <translation>Nous sommes désolés, mais KeePassXC-Browser n’est pas disponible via Snap pour le moment.</translation>
     </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation>KeePassXC-Browser est nécessaire pour que l&apos;intégration au navigateur fonctionne. &lt;br /&gt;Téléchargez-le pour %1 et%2.</translation>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation>&amp;Navigateur Tor</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: </source>
+        <translation>&lt;b&gt;Attention&lt;/b&gt;, l&apos;application keepassxc-proxy n&apos;a pas été trouvée !&lt;br /&gt;Veuillez vérifier le répertoire d&apos;installation de KeePassXC ou confirmez le chemin personnalisé dans les options avancées. &lt;br /&gt;L&apos;intégration au navigateur NE MARCHERA PAS sans l&apos;application de serveur mandataire. &lt;br /&gt;Chemin attendu :</translation>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation>Fichiers exécutables</translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation>Tous les fichiers</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"/>
+    </message>
 </context>
 <context>
     <name>BrowserService</name>
@@ -417,152 +725,44 @@ Voulez-vous la remplacer ?</translation>
         <translation>Voulez-vous mettre à jour les informations dans %1 - %2 ?</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC : La base de données est verrouillée !</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>La base de données active est verrouillée !
-Veuillez déverrouiller la base de données sélectionnée ou en choisir une autre déverrouillée.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC : Les paramètres ne sont pas disponibles !</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation>La base de données active ne contient pas d’entrée paramètre.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC : Aucune clé n’a été trouvée</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation>Aucune clé de chiffrement trouvée dans les paramètres de KeePassXC.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC : Les clés ont été supprimées de la base de données</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation><numerusform>Cette clé de chiffrement a été retirée avec succès des paramètres de KeepassXC.</numerusform><numerusform>%n clés de chiffrement ont été retirées avec succès des paramètres de KeePassXC.</numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>Retrait des autorisations enregistrées…</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC : Les autorisations ont été retirées</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation><numerusform>Les autorisations d’%n entrée ont été retirées avec succès.</numerusform><numerusform>Les autorisations de %n entrées ont été retirées avec succès.</numerusform></translation>
-    </message>
-    <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC : Aucune entrée avec autorisation n’a été trouvée !</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>La base de données active ne contient pas d’entrée avec des autorisations.</translation>
+        <source>Converting attributes to custom data…</source>
+        <translation>Conversion des attributs en données personnalisées…</translation>
     </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
     <message>
-        <source>Password</source>
-        <translation>Mot de passe</translation>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enter password:</source>
-        <translation>Saisir un mot de passe :</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>Répéter le mot de passe :</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;fichier-clé</translation>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation>Les attributs de %1 entrées ont été converties avec succès.
+%2 clés ont été déplacées vers les données personnalisées.</translation>
     </message>
-    <message>
-        <source>Browse</source>
-        <translation>Parcourir</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Créer</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>Cha&amp;llenge-réponse</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Actualiser</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>Fichiers-clés</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>Tous les fichiers</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>Créer un fichier-clé…</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>Impossible de créer le fichier-clé :</translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>Sélectionner un fichier-clé</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Mot de passe vide</translation>
-    </message>
-    <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>Voulez-vous vraiment laisser vide le champ de mot de passe ?</translation>
-    </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>Les mots de passe insérés sont différents.</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation><numerusform>%n clé a été déplacée avec succès vers les données personnalisées.</numerusform><numerusform>%n clés ont été déplacées avec succès vers les données personnalisées.</numerusform></translation>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>Échec de définition de %1 comme fichier-clé :
-%2</translation>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Legacy key file format</source>
-        <translation>Format de fichier-clé hérité</translation>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation>La base de données active ne contient pas d&apos;entrée avec des attributs KeePassHTTP.</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>Vous utilisez un format de fichier-clé hérité qui pourrait ne plus être pris en charge à l’avenir.
-
-Veuillez envisager de générer un nouveau fichier-clé.</translation>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>Échec de changement de clé maîtresse : aucune YubiKey n’est insérée.</translation>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -643,14 +843,6 @@ Veuillez envisager de générer un nouveau fichier-clé.</translation>
         <translation>Non présent dans le fichier CSV</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>Nom de champ vide</translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>colonne</translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>Importé depuis un fichier CSV</translation>
     </message>
@@ -659,48 +851,85 @@ Veuillez envisager de générer un nouveau fichier-clé.</translation>
         <translation>Données originales :</translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>Des erreurs ont été détectées dans le fichier CSV !</translation>
+        <source>Error</source>
+        <translation>Erreur</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation>plus de messages ignorés]</translation>
+        <source>Empty fieldname %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Erreur</translation>
+        <source>column %1</source>
+        <translation>colonne %1</translation>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>Importation du CSV : le scripteur comporte des erreurs :
-</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation>Des erreurs ont été détectées dans le fichier CSV !</translation>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>Erreur</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation><numerusform>[%n message supplémentaire ignoré]</numerusform><numerusform>[%n messages supplémentaires ignorés]</numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Impossible de calculer la clé maîtresse</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation>Import CSV: scripteur a rencontré des erreurs:
+%1</translation>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
-        <translation><numerusform>%n octet, </numerusform><numerusform>%n octets, </numerusform></translation>
+        <source>%n column(s)</source>
+        <translation><numerusform>%n colonne</numerusform><numerusform>%n colonnes</numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation>%1, %2, %3</translation>
     </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
-        <translation><numerusform>%n ligne, </numerusform><numerusform>%n lignes, </numerusform></translation>
+        <source>%n byte(s)</source>
+        <translation><numerusform>%n octet</numerusform><numerusform>%n octets</numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
-        <translation><numerusform>%n colonne</numerusform><numerusform>%n colonnes</numerusform></translation>
+        <source>%n row(s)</source>
+        <translation><numerusform>%n ligne</numerusform><numerusform>%n lignes</numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Racine</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>Le fichier %1 n&apos;existe pas.</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Impossible d&apos;ouvrir le fichier %1.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation>Erreur lors de la lecture de la base de données: %1</translation>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation>Impossible d&apos;enregistrer car la base de données n&apos;a pas de nom de fichier.</translation>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation>Le fichier ne peut pas être enregistré car il est ouvert en lecture seule.</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation>Déverrouiller la base de données - KeePassXC</translation>
     </message>
 </context>
 <context>
@@ -730,14 +959,6 @@ Veuillez envisager de générer un nouveau fichier-clé.</translation>
         <translation>Question-réponse :</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Impossible d’ouvrir la base de données.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Impossible d’ouvrir le fichier-clé</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation>Format de fichier-clé hérité</translation>
     </message>
@@ -766,105 +987,172 @@ Veuillez envisager de générer un nouveau fichier-clé.</translation>
         <source>Select key file</source>
         <translation>Sélectionner un fichier-clé</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>Réparer la base de données</translation>
+        <source>TouchID for quick unlock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Erreur</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation>Impossible d&apos;ouvrir la base de données:
+%1</translation>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Impossible d’ouvrir le fichier-clé</translation>
+        <source>Can't open key file:
+%1</source>
+        <translation>Impossible d’ouvrir le fichier-clé:
+%1</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Impossible d’ouvrir la base de données.</translation>
+        <source>Passwords</source>
+        <translation>Mots de passe</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Paramètres avancés</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Général</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>La base de données s’est bien ouverte. Aucune action nécéssaire.</translation>
+        <source>Security</source>
+        <translation>Sécurité</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>Réussite</translation>
+        <source>Master Key</source>
+        <translation>Clé maîtresse</translation>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>La base de données a été réparée avec succès.
-Vous pouvez maintenant l’enregistrer.</translation>
+        <source>Encryption Settings</source>
+        <translation>Paramètres de chiffrement</translation>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>Impossible de réparer la base de données.</translation>
+        <source>Browser Integration</source>
+        <translation>Intégration aux navigateurs</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>Général</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation>Paramètres KeePassXC-Browser</translation>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>Chiffrement</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>&amp;Déconnecter tous les navigateurs</translation>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Nombre de tours trop élevé</translation>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation type="unfinished"/>
     </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>Vous utilisez un très grand nombre de cycles de transformation de clé avec Argon2.
-
-Si vous conservez ce nombre, votre base de données pourrait prendre des heures voire des jours (ou plus) pour s’ouvrir !</translation>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Understood, keep number</source>
-        <translation>Compris, conserver ce nombre</translation>
+        <source>Stored keys</source>
+        <translation>Clés stockées</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>Annulé</translation>
+        <source>Remove</source>
+        <translation>Supprimer</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Nombre de tours trop faible</translation>
+        <source>Delete the selected key?</source>
+        <translation>Supprimer la clé sélectionnée ?</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>Vous utilisez un très petit nombre de cycles de transformation de clé avec AES-KDF.
-
-Si vous conservez ce nombre, votre base de données pourrait être craquées trop facilement !</translation>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation>Voulez-vous vraiment supprimer la clé sélectionnée ?
+Cela peut empêcher la connexion avec l&apos;extension de navigateur.</translation>
     </message>
     <message>
-        <source>KDF unchanged</source>
-        <translation>KDF inchangé</translation>
+        <source>Key</source>
+        <translation>Clé</translation>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
-        <translation>Échec de la transformation de la clé avec les nouveaux paramètres KDF; KDF inchangé.</translation>
+        <source>Value</source>
+        <translation>Valeur</translation>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation>Activez l&apos;intégration avec le navigateur pour accéder à ces paramètres.</translation>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation>Déconnecter tous les navigateurs web</translation>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation>Voulez-vous vraiment désactiver tous les navigateurs ?
+Cela peut empêcher la connexion avec l&apos;extension de navigateur.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC : Aucune clé n’a été trouvée</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation>Aucune clé de chiffrement trouvée dans les paramètres de KeePassXC.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC : Les clés ont été supprimées de la base de données</translation>
     </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
-        <translation><numerusform> MiB</numerusform><numerusform> MiB</numerusform></translation>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation><numerusform>%n clé de chiffrement a été retirée avec succès des paramètres de KeePassXC.</numerusform><numerusform>%n clés de chiffrement ont été retirées avec succès des paramètres de KeePassXC.</numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Retrait des autorisations enregistrées…</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Annuler</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC : Les autorisations ont été retirées</translation>
     </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
-        <translation><numerusform> fil d’exécution</numerusform><numerusform> fils d’exécution</numerusform></translation>
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation><numerusform>Les autorisations de %n entrée a été retirée avec succès.</numerusform><numerusform>Les autorisations de %n entrées ont été retirées avec succès.</numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC : Aucune entrée avec autorisation n’a été trouvée !</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>La base de données active ne contient pas d’entrée avec des autorisations.</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
     </message>
 </context>
 <context>
@@ -901,6 +1189,113 @@ Si vous conservez ce nombre, votre base de données pourrait être craquées tro
         <source>Parallelism:</source>
         <translation>Parallélisme :</translation>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation>Temps de déchiffrement :</translation>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation>?? s</translation>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation>100 ms</translation>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation>5 s</translation>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation>Une valeur plus élevée offre plus de sécurité mais l&apos;ouverture de la base de données prendra plus de temps.</translation>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation>Format de la base de données :</translation>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation>Ce n&apos;est important que si vous utilisez la base de données avec d&apos;autres programmes.</translation>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation>KDBX 4.0 (recommandé)</translation>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation>KDBX 3.1</translation>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation>inchangé</translation>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Nombre de tours trop élevé</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>Vous utilisez un très grand nombre de cycles de transformation de clé avec Argon2.
+
+Si vous conservez ce nombre, votre base de données pourrait prendre des heures voire des jours (ou plus) pour s’ouvrir !</translation>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation>Compris, conserver ce nombre</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuler</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Nombre de tours trop faible</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>Vous utilisez un très petit nombre de cycles de transformation de clé avec AES-KDF.
+
+Si vous conservez ce nombre, votre base de données pourrait être craquées trop facilement !</translation>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation>KDF inchangé</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation>Échec de la transformation de la clé avec les nouveaux paramètres KDF ; KDF inchangé.</translation>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation><numerusform>fils d&apos;exécution</numerusform><numerusform>fils d&apos;exécution</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation><numerusform>%1 ms</numerusform><numerusform>%1 ms</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -950,91 +1345,112 @@ Si vous conservez ce nombre, votre base de données pourrait être craquées tro
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>Racine</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Base de données KeePass 2</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Tous les fichiers</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Ouvrir la base de données</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>Le fichier est introuvable !</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Impossible d’ouvrir la base de données.</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>Fichier ouvert en lecture seule.</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>Ouvrir le fichier CSV</translation>
+        <source>Add additional protection...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>Fichier CSV</translation>
+        <source>No encryption key added</source>
+        <translation>Aucune clé de chiffrement ajoutée</translation>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>Tous les fichiers (*)</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation>Vous devez ajouter au moins une clé de chiffrement pour protéger votre base de données !</translation>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Fusionner la base de données</translation>
+        <source>No password set</source>
+        <translation>Aucun mot de passe défini</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Ouvrir une base de données KeePass 1</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>ATTENTION ! Vous n&apos;avez pas défini de mot de passe. L&apos;utilisation d&apos;une base de données sans mot de passe est fortement découragée.
+
+Êtes-vous sûr de vouloir continuer sans mot de passe ?</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>Base de données KeePass 1</translation>
+        <source>Unknown error</source>
+        <translation>Erreur inconnue</translation>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>Fermer ?</translation>
+        <source>Failed to change master key</source>
+        <translation>Impossible de modifier la clé maîtresse</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>« %1 » est en mode édition.
-Ignorer les changements et fermer quand même ?</translation>
+        <source>Database Name:</source>
+        <translation>Nom de la base de données :</translation>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>Enregistrer les changements ?</translation>
+        <source>Description:</source>
+        <translation>Description :</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>« %1 » a été modifié.
-Enregistrer les changements ?</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Base de données KeePass 2</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Une erreur s’est produite lors de l’écriture de la base de données.</translation>
+        <source>All files</source>
+        <translation>Tous les fichiers</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Mots de passe</translation>
+        <source>Open database</source>
+        <translation>Ouvrir la base de données</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Enregistrer la base de données sous</translation>
+        <source>CSV file</source>
+        <translation>Fichier CSV</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>Fusionner la base de données</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Ouvrir une base de données KeePass 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>Base de données KeePass 1</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1045,40 +1461,40 @@ Enregistrer les changements ?</translation>
         <translation>Échec de l’écriture du fichier CSV.</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>Nouvelle base de données</translation>
+        <source>Database creation error</source>
+        <translation>Erreur de création de la base de données</translation>
     </message>
     <message>
-        <source>locked</source>
-        <translation>verrouillée</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 type="unfinished"/>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>Verrouiller la base de données</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation>Le fichier de base de données n&apos;existe pas ou n&apos;est pas accessible.</translation>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>Impossible de verrouiller la base de données lors de changements.
-Cliquez sur Annuler pour finir vos changements ou abandonnez-les.</translation>
+        <source>Select CSV file</source>
+        <translation>Sélectionner un fichier CSV</translation>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>Cette base de données a été modifiée.
-Voulez-vous l’enregistrer avant de la verrouiller ?
-Autrement, vos changements seront perdus</translation>
+        <source>New Database</source>
+        <translation>Nouvelle base de données</translation>
     </message>
     <message>
-        <source>Disable safe saves?</source>
-        <translation>Désactiver les enregistrements sécurisées ?</translation>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Nouvelle base de données]</translation>
     </message>
     <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 n’a pas réussi, à plusieurs reprises, à enregistrer la base de données. Cela est probablement causé par le maintien d’un verrou sur le fichier enregistré par les services de synchronisation de fichiers.
-Désactiver les enregistrements sécurisés et ressayer ?</translation>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Verrouillé]</translation>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Lecture seule]</translation>
     </message>
 </context>
 <context>
@@ -1088,37 +1504,13 @@ Désactiver les enregistrements sécurisés et ressayer ?</translation>
         <translation>Recherche...</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>Changer la clé maîtresse</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>Supprimer l’entrée ?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>Voulez-vous vraiment supprimer définitivement l’entrée « %1 » ?</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Supprimer les entrées ?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Voulez-vous vraiment supprimer définitivement %1 entrées ?</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Déplacer l’entrée vers la corbeille ?</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation>Voulez-vous vraiment déplacer l’entrée « %1 » vers la corbeille ?</translation>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Déplacer les entrées vers la corbeille ?</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation><numerusform>Voulez-vous vraiment déplacer %n entrée vers la corbeille ?</numerusform><numerusform>Voulez-vous vraiment déplacer %n entrées vers la corbeille ?</numerusform></translation>
@@ -1136,18 +1528,10 @@ Désactiver les enregistrements sécurisés et ressayer ?</translation>
         <translation>Se souvenir de mon choix</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Supprimer le groupe ?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>Voulez-vous vraiment supprimer définitivement le groupe « %1 » ?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Impossible de calculer la clé maîtresse</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>Pas de base de données.</translation>
     </message>
@@ -1182,10 +1566,6 @@ Do you want to merge your changes?</source>
 Voulez-vous fusionner vos changements ?</translation>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>La nouvelle base de données ne peut être ouverte pendant qu’un rafraîchissement automatique de l’actuelle est en cours.</translation>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>Vider la corbeille ?</translation>
     </message>
@@ -1193,88 +1573,106 @@ Voulez-vous fusionner vos changements ?</translation>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>Êtes-vous certain de vouloir vider définitivement la corbeille ?</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>Générer un code TOTP</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation><numerusform>Voulez-vous vraiment supprimer définitivement %1 entrée ?</numerusform><numerusform>Voulez-vous vraiment supprimer définitivement %1 entrées ?</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation><numerusform>Supprimer l&apos;entrée ?</numerusform><numerusform>Supprimer les entrées ?</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation><numerusform>Déplacer l’entrée vers la corbeille ?</numerusform><numerusform>Déplacer les entrées vers la corbeille ?</numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Fermer</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Fichier ouvert en lecture seule.</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Général</translation>
+        <source>Lock Database?</source>
+        <translation>Verrouiller la base de données ?</translation>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Mot de passe</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation>Une entrée est en mode édition. Ignorer les changements et verrouiller quand même ?</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>« %1 » a été modifié.
+Enregistrer les changements ?</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>Expiration</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation>La base de données a été modifiée.
+Enregistrer les changements ?</translation>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Nom d’utilisateur</translation>
+        <source>Save changes?</source>
+        <translation>Enregistrer les changements ?</translation>
     </message>
     <message>
-        <source>Autotype</source>
-        <translation>Saisie automatique</translation>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>Recherche...</translation>
+        <source>Disable safe saves?</source>
+        <translation>Désactiver les enregistrements sécurisées ?</translation>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>Attributs</translation>
+        <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 n’a pas réussi, à plusieurs reprises, à enregistrer la base de données. Cela est probablement causé par le maintien d’un verrou sur le fichier enregistré par les services de synchronisation de fichiers.
+Désactiver les enregistrements sécurisés et ressayer ?</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Pièces jointes</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation>Une erreur s’est produite lors de l’écriture de la base de données.
+%1</translation>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Notes</translation>
+        <source>Passwords</source>
+        <translation>Mots de passe</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>Fenêtre</translation>
+        <source>Save database as</source>
+        <translation>Enregistrer la base de données sous</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>Séquence</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Base de données KeePass 2</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Recherche</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Effacer</translation>
+        <source>Delete group</source>
+        <translation>Supprimer le groupe</translation>
     </message>
     <message>
-        <source>Never</source>
-        <translation>Jamais</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[PROTÉGER]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>Désactivé</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Activé</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1348,22 +1746,10 @@ Voulez-vous fusionner vos changements ?</translation>
         <translation>Nouvel attribut</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Confirmer la suppression</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>Êtes-vous certain de vouloir supprimer cet attribut ?</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[PROTÉGÉ]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation>Appuyez sur Révéler pour voir ou éditer</translation>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>Demain</translation>
     </message>
@@ -1376,10 +1762,6 @@ Voulez-vous fusionner vos changements ?</translation>
         <translation><numerusform>%n mois</numerusform><numerusform>%n mois</numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 an</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation>Appliquer le mot de passe généré ?</translation>
     </message>
@@ -1391,6 +1773,26 @@ Voulez-vous fusionner vos changements ?</translation>
         <source>Entry updated successfully.</source>
         <translation>Entrée mise à jour avec succès.</translation>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation>L&apos;entrée contient des modifications non-enregistrées</translation>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation>Nouvel attribut %1</translation>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation>[PROTÉGÉ] Appuyez pour révéler ou éditer</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n année</numerusform><numerusform>%n années</numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1636,6 +2038,81 @@ Voulez-vous fusionner vos changements ?</translation>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulaire</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Mot de passe :</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1693,10 +2170,6 @@ Voulez-vous fusionner vos changements ?</translation>
         <translation>Impossible de récupérer la favicône</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Astuce : Vous pouvez activer Google en second recours sous Outils&gt;Paramètres&gt;Sécurité</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>Images</translation>
     </message>
@@ -1705,14 +2178,6 @@ Voulez-vous fusionner vos changements ?</translation>
         <translation>Tous les fichiers</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Choisir une image</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read icon</source>
-        <translation>Impossible de lire l’icône</translation>
-    </message>
-    <message>
         <source>Custom icon already exists</source>
         <translation>L’icône personnalisée existe déjà</translation>
     </message>
@@ -1721,8 +2186,36 @@ Voulez-vous fusionner vos changements ?</translation>
         <translation>Confirmer la suppression</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>Cette icône est utilisée par %1 entrées et sera remplacée par l’icône par défaut. Êtes-vous certain de vouloir l’effacer ?</translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation>Icône personnalisée téléchargée avec succès</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>Astuce : Vous pouvez activer DuckDuckGo comme second recours sous Outils &gt; Paramètres &gt; Sécurité</translation>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation>Sélectionner des images</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation><numerusform>%1 icône sur %n chargée avec succès</numerusform><numerusform>%1 icônes sur %n chargées avec succès</numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation>Aucune icône n&apos;a été chargée</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation><numerusform>%n icône existe déjà dans la base de données</numerusform><numerusform>%n icônes existent déjà dans la base de données</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation><numerusform>L&apos;icône suivante a rencontré des erreurs:</numerusform><numerusform>Les icônes suivantes ont rencontré des erreurs :</numerusform></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>Cette icône est utilisée par %1 entrée et sera remplacée par l’icône par défaut. Êtes-vous certain de vouloir l’effacer ?</numerusform><numerusform>Cette icône est utilisée par %1 entrées et sera remplacée par l’icône par défaut. Êtes-vous certain de vouloir l’effacer ?</numerusform></translation>
     </message>
 </context>
 <context>
@@ -1772,9 +2265,8 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation> - Clone</translation>
+        <source>%1 - Clone</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1819,10 +2311,6 @@ This may cause the affected plugins to malfunction.</source>
         <translation><numerusform>Êtes-vous certain de vouloir supprimer %n pièce jointe ?</numerusform><numerusform>Êtes-vous certain de vouloir supprimer %n pièces jointes ?</numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Confirmer la suppression</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>Enregistrer les pièces jointes</translation>
     </message>
@@ -1859,10 +2347,13 @@ This may cause the affected plugins to malfunction.</source>
 %1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation>Confirmer la suppression</translation>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>Impossible d’ouvrir le fichier :
-%1</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1946,6 +2437,106 @@ This may cause the affected plugins to malfunction.</source>
         <source>Attachments</source>
         <translation>Pièces jointes</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>Oui</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>Générer un code TOTP</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Fermer</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Général</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Nom d’utilisateur</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Mot de passe</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Expiration</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>Attributs</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Pièces jointes</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notes</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Saisie automatique</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Fenêtre</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Séquence</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Recherche…</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Recherche</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Effacer</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Jamais</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[PROTÉGÉ]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Activé</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Désactivé</translation>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EntryView</name>
@@ -1984,6 +2575,19 @@ This may cause the affected plugins to malfunction.</source>
         <source>Recycle Bin</source>
         <translation>Corbeille</translation>
     </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation>[vide]</translation>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>HostInstaller</name>
@@ -1997,61 +2601,6 @@ This may cause the affected plugins to malfunction.</source>
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>Longueur :</translation>
-    </message>
-    <message>
-        <source>Character Types</source>
-        <translation>Types de caractères:</translation>
-    </message>
-    <message>
-        <source>Upper Case Letters</source>
-        <translation>Lettres majuscules</translation>
-    </message>
-    <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
-    </message>
-    <message>
-        <source>Lower Case Letters</source>
-        <translation>Lettres minuscules</translation>
-    </message>
-    <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
-    </message>
-    <message>
-        <source>Numbers</source>
-        <translation>Chiffres</translation>
-    </message>
-    <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
-    </message>
-    <message>
-        <source>Special Characters</source>
-        <translation>Caractères spéciaux</translation>
-    </message>
-    <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
-    </message>
-    <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Exclure les caractères qui se ressemblent</translation>
-    </message>
-    <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>S’assurer que le mot de passe contienne des caractères de chaque groupe</translation>
-    </message>
-    <message>
-        <source>Extended ASCII</source>
-        <translation>ASCII étendu</translation>
-    </message>
-</context>
-<context>
     <name>KMessageWidget</name>
     <message>
         <source>&amp;Close</source>
@@ -2076,6 +2625,26 @@ This may cause the affected plugins to malfunction.</source>
         <source>Wrong key or database file is corrupt.</source>
         <translation>La clé n’est pas la bonne ou le fichier de base de données est corrompu.</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation>les en-têtes de la base de données manquent</translation>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation>L&apos;en-tête ne correspond pas à l&apos;empreinte numérique</translation>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>Taille de l’id de l’en-tête non valide</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>Longueur du champ de l’en-tête invalide</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>Longueur des données de l’en-tête non valide</translation>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2235,10 +2804,6 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation>Longueur de l’uuid du chiffrement non valide</translation>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation>Chiffrement non supporté</translation>
     </message>
@@ -2292,6 +2857,18 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
         <source>Unsupported KeePass 2 database version.</source>
         <translation>Version de la base de données KeePass 2 non pris en charge.</translation>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation>Longueur de l’UUID du chiffrement invalide: %1 (longueur=%2)</translation>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation>Impossible de lire l&apos;UUID: %1</translation>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2364,10 +2941,6 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
         <translation>Élément de l’historique avec un uuid différent</translation>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation>Impossible de déchiffrer la chaîne de caractères de l’entrée</translation>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation>Dupliquer l’attribut personnalisé trouvé</translation>
     </message>
@@ -2416,6 +2989,14 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation>Impossible de décompresser le binaire</translation>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation>Erreur XML:
+%1
+Ligne %2, colonne %3</translation>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2579,28 +3160,129 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
         <source>Invalid entry field type</source>
         <translation>Champ d’entrée type est invalide</translation>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>Le fichier de verrouillage de l’instance unique existant n’est pas valide. Lancement d’une nouvelle instance.</translation>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>Le fichier de verrouillage ne peut pas être créé. Le mode d’instance unique est désactivé.</translation>
+        <source>Import from</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Une autre instance de KeePassXC est déjà en cours d’exécution.</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Erreur fatale lors des tests des fonctions cryptographiques.</translation>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Erreur</translation>
+        <source>Key Component</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuler</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation>Ajouter %1</translation>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation>Modifier %1</translation>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation>Supprimer %1</translation>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation>%1 configuré, cliquer pour modifier ou supprimer</translation>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>Parcourir</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Générer</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation>Fichier-clé</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;Vous pouvez ajouter un fichier-clé contenant des bits aléatoires pour une sécurité accrue.&lt;/p&gt;&lt;p&gt;Vous devez le garder secret et ne jamais le perdre ou vous ne pourrez plus vous connecter !&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation>Format de fichier-clé hérité</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>Vous utilisez un format de fichier-clé hérité qui pourrait ne plus être pris en charge à l’avenir.
+
+Veuillez ouvrir les paramètres de clé maîtresse et générer un nouveau fichier-clé.</translation>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation>Erreur durant le chargement du fichier-clé &apos;%1&apos;
+Message: %2</translation>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Fichiers-clés</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Tous les fichiers</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Créer un fichier-clé…</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation>Erreur lors de la création du fichier-clé</translation>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation>Impossible de créer le fichier-clé : %1</translation>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Sélectionner un fichier-clé</translation>
     </message>
 </context>
 <context>
@@ -2614,10 +3296,6 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
         <translation>&amp;Bases de données récentes</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Importer</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
@@ -2626,14 +3304,6 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
         <translation>E&amp;ntrées</translation>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>Copier l’att&amp;ribut dans le presse-papiers</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation>Mot de passe à usage unique basé sur le temps</translation>
-    </message>
-    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Groupes</translation>
     </message>
@@ -2662,30 +3332,10 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
         <translation>&amp;Fermer la base de données</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>&amp;Nouvelle base de données</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>Fusionner avec la base de données de KeePassX...</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>&amp;Ajouter une nouvelle entrée</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>&amp;Voir/Éditer l’entrée</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>&amp;Supprimer l’entrée</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>&amp;Ajouter un nouveau groupe</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>&amp;Modifier le groupe</translation>
     </message>
@@ -2698,14 +3348,6 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
         <translation>En&amp;registrer la base de données sous...</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Changer la clé &amp;maîtresse…</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>&amp;Paramètres de la base de données</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>Paramètres de la base de données</translation>
     </message>
@@ -2714,10 +3356,6 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
         <translation>&amp;Cloner l’entrée</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>Trouver</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>Copier le nom d’utilisateur</translation>
     </message>
@@ -2726,10 +3364,6 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
         <translation>Copier le nom d’utilisateur dans le presse-papiers</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>Cop&amp;ier le mot de passe</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>Copier le mot de passe dans le presse-papiers</translation>
     </message>
@@ -2742,14 +3376,6 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
         <translation>Générateur de mots de passe</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation>&amp;Exécuter la saisie automatique</translation>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>&amp;Ouvrir l’URL</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>&amp;Verrouiller les bases de données</translation>
     </message>
@@ -2782,22 +3408,6 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
         <translation>&amp;Exporter dans un fichier CSV...</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Importer une base de données KeePass 1...</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>Importer un fichier CSV...</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Ré&amp;parer la base de données...</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>Afficher TOTP</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>Configurer TOTP...</translation>
     </message>
@@ -2818,14 +3428,6 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
         <translation>Erreur d’accès au fichier de configuration %1</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Il semble que vous utilisez KeePassHTTP pour l’intégration aux navigateurs. Cette fonction a été dépréciée et sera prochainement supprimée.&lt;br&gt;Veuillez plutôt utiliser KeePassXC-Browser ! Pour obtenir de l’aide à ce sujet, consultez notre&lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;guide de migration&lt;/a&gt; (avertissement %1 sur 3).&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>Lecture seule</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Paramètres</translation>
     </message>
@@ -2838,36 +3440,278 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
         <translation>Quitter KeePassXC</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Base de données KeePass 2</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Veuillez appuyez sur le bouton de votre YubiKey !</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Tous les fichiers</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation>AVERTISSEMENT : Vous utilisez une version instable du KeePassXC !
+Le risque de corruption est élevé, conservez une sauvegarde de vos bases de données.
+Cette version n’est pas destinée à la production.</translation>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Ouvrir la base de données</translation>
+        <source>&amp;Donate</source>
+        <translation>&amp;Donner</translation>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Enregistrer la base de données réparée</translation>
+        <source>Report a &amp;bug</source>
+        <translation>Signaler un &amp;bug</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Une erreur s’est produite lors de l’écriture de la base de données.</translation>
+        <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>ATTENTION : Votre version de Qt pourrait causer un crash de KeePassXC avec un clavier virtuel !
+Nous recommandons l&apos;utilisation de l&apos;AppImage disponible sur notre page de téléchargements.</translation>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Veuillez appuyez sur le bouton de votre YubiKey !</translation>
+        <source>&amp;Import</source>
+        <translation>&amp;Importer</translation>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
-        <translation>AVERTISSEMENT : Vous utilisez une version instable du KeePassXC !
-Le risque de corruption est élevé, conservez une sauvegarde de vos bases de données.
-Cette version n’est pas destinée à la production.</translation>
+        <source>Copy att&amp;ribute...</source>
+        <translation>Copier l&apos;att&amp;ribut ...</translation>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation>TOTP...</translation>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation>&amp;Ńouvelle base de données...</translation>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation>Créer une nouvelle base de données</translation>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation>&amp;Fusionner depuis la base de données...</translation>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation>Fusionner depuis une autre base de données KDBX</translation>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation>&amp;Nouvelle entrée</translation>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation>Ajouter une entrée</translation>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation>Modifier l’entrée</translation>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation>Voir ou modifier l&apos;entrée</translation>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation>&amp;Nouveau groupe</translation>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation>Ajouter un groupe</translation>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation>Changer la clé &amp;maîtresse…</translation>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation>Paramètres de la base de &amp;données ...</translation>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation>Copier le mot de &amp;passe</translation>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation>Effectuer un remplissage &amp;automatique</translation>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation>Ouvrir l&apos;&amp;URL</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation>Base de données KeePass 1 ...</translation>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation>Importer une base de données KeePass 1</translation>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation>Fichier CSV ...</translation>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation>Importer un fichier CSV</translation>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation>Afficher TOTP ...</translation>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation>Afficher le QR Code TOTP ...</translation>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation>Création du %1 manquant [%2]</translation>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation>Déplacement de %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation>Écrasement de %1 [%2]</translation>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation>ancienne entrée fusionnée de la base de données &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation>Ajout d&apos;une sauvegarde pour l&apos;ancienne cible %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation>Ajout d&apos;une sauvegarde pour l&apos;ancienne source %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation>Ré-application de l&apos;ancienne entrée cible sur la nouvelle source %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation>Ré-application de l&apos;ancienne entrée source sur la nouvelle cible %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation>Synchronisation depuis une source plus récente %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation>Synchronisation depuis une source plus ancienne %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation>Suppression de l&apos;enfant %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation>Suppression de l&apos;orphelin %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation>Objets supprimés modifiés</translation>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation>Ajout de l&apos;icône manquante %1</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation>Créer une nouvelle base de données KeePassXC</translation>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Racine</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation>Paramètres de &amp;chiffrement</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>Vous pouvez ajuster ici les paramètres de chiffrement de la base de données. Vous pourrez sans problèmes les changer plus tard dans les paramètres de la base de données.</translation>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Paramètres avancés</translation>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation>Paramètres simplifiés</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <translation>Paramètres de chiffrement</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>Vous pouvez ajuster ici les paramètres de chiffrement de la base de données. Vous pourrez sans problèmes les changer plus tard dans les paramètres de la base de données.</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation>Veuillez renseigner le nom et optionnellement une description pour votre nouvelle base de données :</translation>
     </message>
 </context>
 <context>
@@ -2970,125 +3814,34 @@ Cette version n’est pas destinée à la production.</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation>Dialogue</translation>
-    </message>
-    <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>Ceci est requis pour accéder à vos bases de données à partir de ChromeIPass ou PassIFox</translation>
-    </message>
-    <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>Activer le serveur KeePassHTTP</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Général</translation>
-    </message>
-    <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>&amp;Afficher une notification quand les identifiants sont demandés</translation>
-    </message>
-    <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>Ne renvoie que les meilleures correspondances pour une URL précise au lieu de toutes les entrées du domaine.</translation>
-    </message>
-    <message>
-        <source>&amp;Return only best matching entries</source>
-        <translation>&amp;Retourner seulement les meilleurs entrées</translation>
-    </message>
-    <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Demander de déverrouiller la base de données lorsque celle-ci est verrouillée</translation>
-    </message>
-    <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation>Seules les entrées avec le même schéma (http://, https://, ftp://, ...) sont retournées.</translation>
-    </message>
-    <message>
-        <source>&amp;Match URL schemes</source>
-        <translation>&amp;Schémas de correspondance URL</translation>
-    </message>
-    <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Trier les entrées correspondantes par nom d’&amp;utilisateur</translation>
-    </message>
-    <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Trier les entrées correspondantes par titre</translation>
-    </message>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>Supprimer toutes les clés de chiffrement partagées de la base de données active</translation>
-    </message>
-    <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>&amp;Retirer toutes les autorisations enregistrées des entrées de la base de données active</translation>
-    </message>
-    <message>
-        <source>Password Generator</source>
-        <translation>Générateur de mots de passe</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Avancé</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Toujours autoriser l’&amp;accès aux entrées</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Toujours autoriser la mise à jour des entrées</translation>
-    </message>
-    <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>Seule la base de données sélectionnée doit être connectée avec un client.</translation>
-    </message>
-    <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Cherc&amp;her dans toutes les bases de données ouvertes les entrées correspondantes</translation>
-    </message>
-    <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>La création ou la mise a jour automatique ne sont pas pris en charge pour les champs de chaines de caractères !</translation>
-    </message>
-    <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>&amp; Retourne les champs avancés de chaîne de caractères qui commencent par &quot;KPH :&quot;</translation>
-    </message>
-    <message>
-        <source>HTTP Port:</source>
-        <translation>Port HTTP :</translation>
+        <source>Enter password:</source>
+        <translation>Saisir un mot de passe :</translation>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Port par défaut : 19455</translation>
+        <source>Confirm password:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC va écouter ce port sur 127.0.0.1</translation>
+        <source>Password</source>
+        <translation>Mot de passe</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;Avertissement :&lt;/b&gt; Les options suivantes peuvent être dangereuses !</translation>
+        <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;Le mot de passe est le moyen principal pour sécuriser votre base de données.&lt;/p&gt;&lt;p&gt;Un bon mot de passe est long et unique. KeePassXC peut en générer un pour vous.&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;KeePassHTTP a été déprécié et sera prochainement supprimé.&lt;br&gt;Veuillez plutôt utiliser KeePassXC-Browser ! Pour obtenir de l’aide à ce sujet, consultez notre &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;guide de migration&lt;/a&gt;.&lt;/p&gt;</translation>
+        <source>Password cannot be empty.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Liaison impossible avec les ports privilégiés</translation>
+        <source>Passwords do not match.</source>
+        <translation>Les mots de passe ne correspondent pas.</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Impossible de se lier aux ports privilégiés inférieurs à 1024 !
-Le port 19455 par défaut sera utilisé.</translation>
+        <source>Generate master password</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3159,18 +3912,10 @@ Le port 19455 par défaut sera utilisé.</translation>
         <translation>Liste de mots :</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Nombre de mots :</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>Séparateur de mot :</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>Générer</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Copie</translation>
     </message>
@@ -3183,10 +3928,6 @@ Le port 19455 par défaut sera utilisé.</translation>
         <translation>Fermer</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>Appliquer</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>Entropie : %1 bits</translation>
     </message>
@@ -3214,6 +3955,171 @@ Le port 19455 par défaut sera utilisé.</translation>
         <comment>Password quality</comment>
         <translation>Excellent</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation>ASCII étendu</translation>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation>Basculer vers le mode avancé</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Avancé</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation>Lettres majuscules de A à F</translation>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation>Lettres minuscules de A à F</translation>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation>{[(</translation>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation>Ponctuation</translation>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation>Guillemets</translation>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation>Basculer vers le mode simplifié</translation>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation>Ensemble de caractères à exclure du mot de passe généré</translation>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation>Ne pas inclure :</translation>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation>Régénérer</translation>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Supprimer</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Supprimer</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Désactiver</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3234,34 +4140,18 @@ Le port 19455 par défaut sera utilisé.</translation>
         <translation>Impossible de déchiffrer le message</translation>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
-        <translation>Connexion expirée ou impossible à KeePassXC</translation>
-    </message>
-    <message>
         <source>Action cancelled or denied</source>
         <translation>Action annulée ou refusée</translation>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation>Le chiffrement du message est impossible ou la clé publique est introuvable. La messagerie native est-elle activée dans KeePassXC ?</translation>
-    </message>
-    <message>
         <source>KeePassXC association failed, try again</source>
         <translation>L’association à KeePassXC a échoué, veuillez réessayer</translation>
     </message>
     <message>
-        <source>Key change was not successful</source>
-        <translation>Le changement de clé n’a pas réussi</translation>
-    </message>
-    <message>
         <source>Encryption key is not recognized</source>
         <translation>La clé de chiffrement n’est pas reconnue</translation>
     </message>
     <message>
-        <source>No saved databases found</source>
-        <translation>Aucune base de données enregistrée n’a été trouvée</translation>
-    </message>
-    <message>
         <source>Incorrect action</source>
         <translation>Action incorrecte</translation>
     </message>
@@ -3387,10 +4277,6 @@ Le port 19455 par défaut sera utilisé.</translation>
         <translation>Insérer le mot de passe pour déverrouiller %1 : </translation>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation>Échec de chargement du fichier-clé %1 : %2</translation>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3474,12 +4360,6 @@ Commandes disponibles :
         <translation>Erreur de lecture sur le périphérique</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>le fichier est vide !
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation>chaîne de caractères malformée</translation>
     </message>
@@ -3488,30 +4368,6 @@ Commandes disponibles :
         <translation>fermeture de citation manquante</translation>
     </message>
     <message>
-        <source>AES: 256-bit</source>
-        <translation>AES : 256 bits</translation>
-    </message>
-    <message>
-        <source>Twofish: 256-bit</source>
-        <translation>Twofish : 256 bits</translation>
-    </message>
-    <message>
-        <source>ChaCha20: 256-bit</source>
-        <translation>ChaCha20 : 256 bits</translation>
-    </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – recommandé)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 4)</source>
-        <translation>AES-KDF (KDBX 4)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 3.1)</source>
-        <translation>AES-KDF (KDBX 3.1)</translation>
-    </message>
-    <message>
         <source>Group</source>
         <translation>Groupe</translation>
     </message>
@@ -3540,10 +4396,6 @@ Commandes disponibles :
         <translation>Créée</translation>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
-        <translation>Ancienne intégration aux navigateurs</translation>
-    </message>
-    <message>
         <source>Browser Integration</source>
         <translation>Intégration aux navigateurs</translation>
     </message>
@@ -3572,10 +4424,6 @@ Commandes disponibles :
         <translation>Nombre de mots de la phrase de passe générée avec la méthode du lancer de dés.</translation>
     </message>
     <message>
-        <source>count</source>
-        <translation>Compte</translation>
-    </message>
-    <message>
         <source>Wordlist for the diceware generator.
 [Default: EFF English]</source>
         <translation>Liste de mots pour le générateur par dés.
@@ -3586,28 +4434,439 @@ Commandes disponibles :
         <translation>Générer un nouveau mot de passe aléatoire.</translation>
     </message>
     <message>
-        <source>Length of the generated password.</source>
-        <translation>Longueur du mot de passe généré.</translation>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation>Mot de passe de l&apos;entrée copié dans le presse-papiers !</translation>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation>Presse-papiers vidé !</translation>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation>Compte</translation>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
-        <translation>Utiliser les caractères minuscules dans le mot de passe créé.</translation>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
-        <translation>Utiliser les caractères majuscules dans le mot de passe créé.</translation>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
-        <translation>Utiliser les nombres dans le mot de passe créé.</translation>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
-        <translation>Utiliser les caractères spéciaux dans le mot de passe créé.</translation>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
-        <translation>Utiliser les caractères ASCII étendus dans le mot de passe créé.</translation>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>Le fichier %1 n&apos;existe pas.</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Impossible d&apos;ouvrir le fichier %1.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation>Taille du mot de passe généré</translation>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation>Utiliser les caractères minuscules</translation>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation>Utiliser les caractères majuscules</translation>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation>Utiliser des nombres.</translation>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation>Utiliser les caractères spéciaux</translation>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation>Utiliser l&apos;ASCII étendu</translation>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation>Exclure les caractères suivants</translation>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation>caractères</translation>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation>Exclure les caractères qui se ressemblent</translation>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation>Inclure des caractères de chaque groupe</translation>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation>Lister récursivement les éléments du groupe</translation>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation>Impossible de trouver le groupe %1.</translation>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation>Erreur lors de la lecture du fichier fusionner:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation>Impossible d&apos;enregistrer la base de données dans le fichier : %1</translation>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation>Impossible d&apos;enregistrer la base de données dans le fichier : %1</translation>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation>Supprimé l&apos;entrée %1 avec succès.</translation>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation>Afficher le TOTP courant pour l&apos;entrée.</translation>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation>ERREUR: attribut %1 inconnu.</translation>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation>Aucun logiciel configuré pour la manipulation du presse-papiers</translation>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation>Impossible de démarrer le logiciel %1</translation>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation>Fichier vide</translation>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation>%1: (ligne,colonne) %2,%3</translation>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation>AES : 256 bits</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish : 256 bits</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20 : 256 bits</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – recommandé)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation>Paramètres invalides</translation>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation>Clé invalide</translation>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>Supprimer une entrée de la base de données.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>Chemin de l’entrée à supprimer.</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>Le fichier de verrouillage de l’instance unique existant n’est pas valide. Lancement d’une nouvelle instance.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Le fichier de verrouillage ne peut pas être créé. Le mode d’instance unique est désactivé.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - Gestionnaire de mots de passe multiplateforme</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>noms de fichiers des bases de données de mots de passe à ouvrir (*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>chemin vers un fichier de configuration personnalisé</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>fichier-clé de la base de données</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>lire le mot de passe de la base de données sur l’entrée standard</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation>Poignée de la fenêtre parent</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Une autre instance de KeePassXC est déjà en cours d’exécution.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Erreur fatale lors des tests des fonctions cryptographiques.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Erreur</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation>Mot de passe de la base de données :</translation>
     </message>
 </context>
 <context>
@@ -3645,12 +4904,98 @@ Commandes disponibles :
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
     <message>
-        <source>Search...</source>
-        <translation>Recherche...</translation>
+        <source>Agent connection failed.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
+        <source>Agent protocol error.</source>
+        <translation>Erreur de protocole avec l&apos;agent</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation>Aucun agent en cours d&apos;exécution, impossible d&apos;ajouter l&apos;identité.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation>Aucun agent en cours d&apos;exécution, impossible de supprimer l&apos;identité.</translation>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation>L&apos;agent a refusé cette identité. Les raisons possibles sont :</translation>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation>La clé a déjà été ajoutée.</translation>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation>Une durée de vie limitée n&apos;est pas supporté par l&apos;agent (vérifier les paramètres).</translation>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation>Une demande de confirmation n&apos;est pas supportée par l&apos;agent (vérifier les paramètres).</translation>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation>Chercher dans l&apos;aide</translation>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation>Champs</translation>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation>Exemples</translation>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
         <source>Search</source>
         <translation>Recherche</translation>
     </message>
@@ -3659,321 +5004,323 @@ Commandes disponibles :
         <translation>Effacer</translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Sensible à la casse</translation>
-    </message>
-    <message>
         <source>Limit search to selected group</source>
         <translation>Limite la recherche au groupe sélectionné</translation>
     </message>
+    <message>
+        <source>Search Help</source>
+        <translation>Chercher dans l&apos;aide</translation>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation>Recherche (%1)...</translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation>Sensible à la casse</translation>
+    </message>
 </context>
 <context>
-    <name>Service</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC : Nouvelle demande d’association de touche</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation>Vous avez reçu une demande d’association pour la clé ci-dessus.
-Si vous voulez autoriser cette clé à accéder à votre base de données KeePassXC,
-attribuez lui un nom unique pour l’identifier et acceptez la.</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC : Remplacer la clé existante ?</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Une clé de chiffrement partagée portant le nom « %1 » existe déjà.
-Voulez-vous la remplacer ?</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC : Mettre l’entrée à jour</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Voulez-vous mettre à jour les informations dans %1 - %2 ?</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC : La base de données est verrouillée !</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>La base de données active est verrouillée !
-Veuillez déverrouiller la base de données sélectionnée ou en choisir une autre déverrouillée.</translation>
+        <source>Key:</source>
+        <translation>Clé :</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC : Les clés ont été supprimées de la base de données</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation><numerusform>%n clé de chiffrement a été retirée avec succès des paramètres de KeePassXC/HTTP.</numerusform><numerusform>%n clés de chiffrement ont été retirées avec succès des paramètres de KeePassXC/HTTP.</numerusform></translation>
+        <source>Generate</source>
+        <translation>Générer</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC : Aucune clé n’a été trouvée</translation>
+        <source>Import</source>
+        <translation>Importer</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>Aucune clé de chiffrement partagée trouvée dans les paramètres de KeePassHttp.</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC : Les paramètres ne sont pas disponibles !</translation>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>La base de données active ne contient pas d’entrée de paramètres KeePassHttp.</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>Retrait des autorisations enregistrées…</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>Annuler</translation>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC : Les autorisations ont été retirées</translation>
+        <source>Remove</source>
+        <translation>Supprimer</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation><numerusform>Les autorisations d’%n entrée ont été retirées avec succès.</numerusform><numerusform>Les autorisations de %n entrées ont été retirées avec succès.</numerusform></translation>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC : Aucune entrée avec autorisation n’a été trouvée !</translation>
+        <source>Status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>La base de données active ne contient pas d’entrée avec des autorisations.</translation>
+        <source>Fingerprint</source>
+        <translation>Empreinte</translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
-        <translation>Paramètres de l’application</translation>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Général</translation>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>Sécurité</translation>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>Erreur d’accès au fichier de configuration %1</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>Paramètres de base</translation>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Démarrer uniquement une seule instance de KeePassXC</translation>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>Se souvenir des dernières bases de données</translation>
+        <source>All files</source>
+        <translation>Tous les fichiers</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Mémoriser les derniers fichiers-clés et les clés électroniques de sécurité</translation>
+        <source>Select path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Charger les bases de données précédentes au démarrage</translation>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>Enregistrer automatiquement en quittant</translation>
+        <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"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>Enregistrer automatiquement après chaque changement</translation>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Recharger automatiquement la base de données quand celle-ci est modifiée depuis l’extérieur</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>Minimiser après avoir copié dans le presse-papiers</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Minimiser la fenêtre lors du démarrage de l’application</translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>Utiliser l’icône de groupe à la création d’une entrée</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Ne pas indiquer la base de données comme modifiée pour les changements hors-données (par exemple : groupes développés)</translation>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
-        <translation>Masquer la Vue détaillée</translation>
+        <source>Never</source>
+        <translation>Jamais</translation>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>Afficher une icône dans la zone de notification</translation>
+        <source>Always</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>Cacher la fenêtre dans la zone de notification une fois minimisée</translation>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
-        <translation>Envoyer la fenêtre dans la zone de notification au lieu de quitter l’application</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
-        <translation>Icône sombre dans la zone de notification</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Langue</translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Saisie automatique</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>Utiliser le titre de l’entrée dans la correspondance des fenêtres pour la saisie automatique globale.</translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>Utiliser l’URL de l’entrée dans la correspondance des fenêtres pour la saisie automatique globale.</translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation>Toujours demander avant de procéder à une saisie automatique</translation>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Raccourci de la saisie automatique</translation>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>Délais de remplissage de la saisie automatique</translation>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation>ms</translation>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
-        <translation>Démarrage</translation>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
-        <translation>Gestion des fichiers</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation>Enregistrer en toute sécurité les fichiers de base de données (peut être incompatible avec Dropbox, etc.)</translation>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
-        <translation>Sauvegarder le fichier de base de données avant d’enregistrer</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
-        <translation>Gestion des entrées</translation>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Général</translation>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
-        <translation>Expirations</translation>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>Vider le presse-papiers après</translation>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> s</translation>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>Verrouiller les bases de données après une inactivité de</translation>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Convenance</translation>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Verrouiller les bases de données quand la session est verrouillée ou l’écran rabattu</translation>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>Verrouiller les bases de données lorsque la fenêtre est minimisée</translation>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>TotpDialog</name>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>Ne pas demander de répéter le mot de passe lorsque celui-ci est visible</translation>
+        <source>Timed Password</source>
+        <translation>Mot de passe programmé</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Afficher les mots de passe en clair par défaut</translation>
+        <source>000000</source>
+        <translation>000000</translation>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
-        <translation>Masquer les mots de passe dans le panneau de prévisualisation</translation>
+        <source>Copy</source>
+        <translation>Copie</translation>
+    </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation><numerusform>Expiration dans &lt;b&gt;%n&lt;/b&gt;seconde</numerusform><numerusform>Expiration dans &lt;b&gt;%n&lt;/b&gt;secondes</numerusform></translation>
     </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
     <message>
-        <source>Hide entry notes by default</source>
-        <translation>Masquer les notes des entrées par défaut</translation>
+        <source>Copy</source>
+        <translation>Copie</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>Confidentialité</translation>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation>NOTE: Les paramètres TOTP sont personnalisés et peuvent ne pas être compatibles avec d&apos;autres logiciels.</translation>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>Utiliser Google en second recours pour télécharger les icônes des sites Web</translation>
+        <source>There was an error creating the QR code.</source>
+        <translation>Une erreur est survenue lors de la création du QR Code.</translation>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
-        <translation>Verrouiller à nouveau la base de données précédemment verrouillée après avoir réalisé la saisie automatique</translation>
+        <source>Closing in %1 seconds.</source>
+        <translation>Fermeture dans %1 secondes.</translation>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation>Configuration TOTP</translation>
     </message>
     <message>
         <source>Key:</source>
-        <translation>Clé :</translation>
+        <translation>Clé :</translation>
     </message>
     <message>
         <source>Default RFC 6238 token settings</source>
@@ -3988,59 +5335,84 @@ Veuillez déverrouiller la base de données sélectionnée ou en choisir une aut
         <translation>Utiliser les paramètres personnalisés</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>Attention : modifiez ces paramètres seulement si vous savez ce que vous faites.</translation>
+        <source>Custom Settings</source>
+        <translation>Paramètres personnalisés</translation>
     </message>
     <message>
         <source>Time step:</source>
-        <translation>Période de temps :</translation>
+        <translation>Période de temps :</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8 chiffres</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> s</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>Taille du code :</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6 chiffres</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>Taille du code :</translation>
+        <source>7 digits</source>
+        <translation>7 chiffres</translation>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> s</translation>
+        <source>8 digits</source>
+        <translation>8 chiffres</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>Mot de passe programmé</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Copie</translation>
+        <source>Close</source>
+        <translation>Fermer</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>Expire dans</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>secondes</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>Déverrouiller la base de données</translation>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4075,42 +5447,26 @@ Veuillez déverrouiller la base de données sélectionnée ou en choisir une aut
     </message>
 </context>
 <context>
-    <name>main</name>
-    <message>
-        <source>Remove an entry from the database.</source>
-        <translation>Supprimer une entrée de la base de données.</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>Chemin d’accès de la base de données.</translation>
-    </message>
-    <message>
-        <source>Path of the entry to remove.</source>
-        <translation>Chemin de l’entrée à supprimer.</translation>
-    </message>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - Gestionnaire de mots de passe multiplateforme</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>noms de fichiers des bases de données de mots de passe à ouvrir (*.kdbx)</translation>
+        <source>Refresh</source>
+        <translation>Actualiser</translation>
     </message>
     <message>
-        <source>path to a custom config file</source>
-        <translation>chemin vers un fichier de configuration personnalisé</translation>
+        <source>YubiKey Challenge-Response</source>
+        <translation>Question-réponse YubiKey</translation>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>fichier-clé de la base de données</translation>
+        <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>&lt;p&gt;Si vous possédez une &lt;a href=&quot;https://www.yubico.com/&quot;&gt;YubiKey&lt;/a&gt;, vous pouvez l&apos;utiliser afin d&apos;améliorer la sécurité.&lt;/p&gt;&lt;p&gt;Cela nécessite qu&apos;un slot de votre YubiKey soit programmé comme &lt;a href=&quot;https://www.yubico.com/products/services-software/personalization-tools/challenge-response/&quot;&gt;Question-réponse HMAC-SHA1&lt;/a&gt;.&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>lire le mot de passe de la base de données sur l’entrée standard</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation>Aucune YubiKey détectée, veuillez vérifier qu&apos;elle soit bien branchée.</translation>
     </message>
     <message>
-        <source>Parent window handle</source>
-        <translation>Poignée de la fenêtre parent</translation>
+        <source>No YubiKey inserted.</source>
+        <translation>Aucune YubiKey insérée.</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_he.ts b/share/translations/keepassx_he.ts
new file mode 100644
index 000000000..309bf7626
--- /dev/null
+++ b/share/translations/keepassx_he.ts
@@ -0,0 +1,5423 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="he" version="2.1">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <source>About KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Contributors</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Debug Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Revision: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Distribution: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Libraries:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Operating system: %1
+CPU architecture: %2
+Kernel: %3 %4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled extensions:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Special thanks from the KeePassXC team go to debfx for creating the original KeePassX.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Version %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Build Type: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>YubiKey</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
+    <message>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AutoType</name>
+    <message>
+        <source>Couldn&apos;t find an entry that matches the window title:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AutoTypeAssociationsModel</name>
+    <message>
+        <source>Window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Default sequence</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AutoTypeMatchModel</name>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AutoTypeSelectDialog</name>
+    <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select entry to Auto-Type:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
+    <message>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember this decision</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation type="unfinished"/>
+    </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: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not ask permission for HTTP &amp;Basic Auth</source>
+        <extracomment>An extra HTTP Basic Auth setting</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Converting attributes to custom data…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CloneDialog</name>
+    <message>
+        <source>Clone Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Replace username and password with references</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy history</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CsvImportWidget</name>
+    <message>
+        <source>Import CSV fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>filename</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>size, rows, columns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encoding</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Codec</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text is qualified by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fields are separated by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comments start with</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>First record has field names</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of headers line to discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Consider &apos;\&apos; an escape character</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Preview</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Column layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not present in CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Imported from CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Original data: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty fieldname %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>column %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error(s) detected in CSV file!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CsvParserModel</name>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n byte(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n row(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenWidget</name>
+    <message>
+        <source>Enter master key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key File:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TouchID for quick unlock</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can't open key file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
+    <message>
+        <source>Passwords</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
+    <message>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Master Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetBrowser</name>
+    <message>
+        <source>KeePassXC-Browser settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Stored keys</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete the selected key?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES:  256 Bit   (default)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish:  256 Bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Derivation Function:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Additional Database Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable &amp;compression (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetKeeShare</name>
+    <message>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
+    <message>
+        <source>Add additional protection...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No encryption key added</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No password set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to change master key</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
+    <message>
+        <source>Database Name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
+    <message>
+        <source>KeePass 2 Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export database to CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database creation error</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseWidget</name>
+    <message>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Do you really want to move %n entry(s) to the recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Execute command?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember my choice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No current database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No source database, nothing to do.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search Results (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No Results</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File has changed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The database file has changed. Do you want to load the changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>File opened in read only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock Database?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable safe saves?</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passwords</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save database as</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 2 Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Delete group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidget</name>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Different passwords supplied.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Tomorrow</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Apply generated password?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you want to apply the generated password to this entry?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry updated successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetAdvanced</name>
+    <message>
+        <source>Additional attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Protect</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reveal</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Foreground Color:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Background Color:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetAutoType</name>
+    <message>
+        <source>Enable Auto-Type for this entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>-</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Window title:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a specific sequence for this association:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetHistory</name>
+    <message>
+        <source>Show</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete all</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetMain</name>
+    <message>
+        <source>URL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Repeat:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Presets</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditGroupWidget</name>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Inherit from parent group (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditGroupWidgetMain</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Use default Auto-Type sequence of parent group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Set default Auto-Type se&amp;quence</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditWidgetIcons</name>
+    <message>
+        <source>&amp;Use default icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add custom icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete custom icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Download favicon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Custom icon already exists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm Delete</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Custom icon successfully downloaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>EditWidgetProperties</name>
+    <message>
+        <source>Created:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modified:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Accessed:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Uuid:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Plugin Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete plugin data?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to delete the selected plugin data?
+This may cause the affected plugins to malfunction.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Entry</name>
+    <message>
+        <source>%1 - Clone</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
+%1</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttributesModel</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryHistoryModel</name>
+    <message>
+        <source>Last modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryModel</name>
+    <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Accessed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryView</name>
+    <message>
+        <source>Customize View</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide Usernames</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide Passwords</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fit to window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fit to contents</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reset to defaults</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments (icon)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Group</name>
+    <message>
+        <source>Recycle Bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KMessageWidget</name>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close message</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeePass1OpenWidget</name>
+    <message>
+        <source>Import KeePass1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open the database.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeePass1Reader</name>
+    <message>
+        <source>Unable to read keyfile.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported encryption algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass database version.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Root</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key transformation failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group field type number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group id field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group creation time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group modification time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group expiry time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group level field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group field type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing group id or level</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing entry field type number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry modification time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry field type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeeShare</name>
+    <message>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
+    <message>
+        <source>Key Component</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Recent databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>E&amp;ntries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Tools</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;About</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Open database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Save database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Close database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Delete entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Edit group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Delete group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sa&amp;ve database as...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Clone entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy username to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy password to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password Generator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Lock databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy title to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy URL to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy notes to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Export to CSV file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Set up TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>E&amp;mpty recycle bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Toggle window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quit KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Donate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Report a &amp;bug</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy att&amp;ribute...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>OpenSSHKey</name>
+    <message>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Base64 decoding failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file way too small.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file magic header id invalid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Found zero keys</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read public key.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No private key payload to decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Trying to run KDF without cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF while reading private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key type: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cipher IV is too short for MD5 kdf</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown KDF: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown key type: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PasswordEditWidget</name>
+    <message>
+        <source>Enter password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Password cannot be empty.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passwords do not match.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate master password</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PasswordGeneratorWidget</name>
+    <message>
+        <source>%p%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character Types</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Upper Case Letters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lower Case Letters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Numbers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Special Characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude look-alike characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Pick characters from every group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Length:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passphrase</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wordlist:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Separator:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy: %1 bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password Quality: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Poor</source>
+        <comment>Password quality</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Weak</source>
+        <comment>Password quality</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Good</source>
+        <comment>Password quality</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excellent</source>
+        <comment>Password quality</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Database not opened</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database hash not available</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Client public key not received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot decrypt message</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>NULL device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>error reading from device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>malformed string</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>missing closing quote</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Last Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Press</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new random diceware passphrase.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word count for the diceware passphrase.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wordlist for the diceware generator.
+[Default: EFF English]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new random password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QtIOCompressor</name>
+    <message>
+        <source>Internal zlib error when compressing: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error writing to underlying device: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error opening underlying device: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading data from underlying device: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Internal zlib error when decompressing: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QtIOCompressor::open</name>
+    <message>
+        <source>The gzip format not supported in this version of zlib.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Internal zlib error: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SSHAgent</name>
+    <message>
+        <source>Agent connection failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Limit search to selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SettingsWidgetKeeShare</name>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Signer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Trust</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ask</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ShareObserver</name>
+    <message>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Always</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TotpDialog</name>
+    <message>
+        <source>Timed Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>000000</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"/>
+    </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>
+    </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>There was an error creating the QR code.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Closing in %1 seconds.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TotpSetupDialog</name>
+    <message>
+        <source>Setup TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use custom settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Custom Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Time step:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>6 digits</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>7 digits</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>8 digits</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>UpdateCheckDialog</name>
+    <message>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WelcomeWidget</name>
+    <message>
+        <source>Start storing your passwords securely in a KeePassXC database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create new database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open existing database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from KeePass 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from CSV</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recent databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Welcome to KeePassXC %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>YubiKeyEditWidget</name>
+    <message>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>YubiKey Challenge-Response</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No YubiKey inserted.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+</TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_hr_HR.ts b/share/translations/keepassx_hr_HR.ts
new file mode 100644
index 000000000..4a497ba5c
--- /dev/null
+++ b/share/translations/keepassx_hr_HR.ts
@@ -0,0 +1,5423 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="hr_HR" version="2.1">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <source>About KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Contributors</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Debug Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Revision: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Distribution: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Libraries:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Operating system: %1
+CPU architecture: %2
+Kernel: %3 %4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled extensions:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Special thanks from the KeePassXC team go to debfx for creating the original KeePassX.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Version %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Build Type: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>YubiKey</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
+    <message>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AutoType</name>
+    <message>
+        <source>Couldn&apos;t find an entry that matches the window title:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AutoTypeAssociationsModel</name>
+    <message>
+        <source>Window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Default sequence</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AutoTypeMatchModel</name>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AutoTypeSelectDialog</name>
+    <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select entry to Auto-Type:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
+    <message>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember this decision</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation type="unfinished"/>
+    </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: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not ask permission for HTTP &amp;Basic Auth</source>
+        <extracomment>An extra HTTP Basic Auth setting</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Converting attributes to custom data…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CloneDialog</name>
+    <message>
+        <source>Clone Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Replace username and password with references</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy history</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CsvImportWidget</name>
+    <message>
+        <source>Import CSV fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>filename</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>size, rows, columns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encoding</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Codec</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text is qualified by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fields are separated by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comments start with</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>First record has field names</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of headers line to discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Consider &apos;\&apos; an escape character</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Preview</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Column layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not present in CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Imported from CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Original data: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty fieldname %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>column %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error(s) detected in CSV file!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CsvParserModel</name>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n byte(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n row(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenWidget</name>
+    <message>
+        <source>Enter master key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key File:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TouchID for quick unlock</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can't open key file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
+    <message>
+        <source>Passwords</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
+    <message>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Master Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetBrowser</name>
+    <message>
+        <source>KeePassXC-Browser settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Stored keys</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete the selected key?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES:  256 Bit   (default)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish:  256 Bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Derivation Function:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Additional Database Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable &amp;compression (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetKeeShare</name>
+    <message>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
+    <message>
+        <source>Add additional protection...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No encryption key added</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No password set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to change master key</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
+    <message>
+        <source>Database Name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
+    <message>
+        <source>KeePass 2 Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export database to CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database creation error</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseWidget</name>
+    <message>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Do you really want to move %n entry(s) to the recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Execute command?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember my choice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No current database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No source database, nothing to do.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search Results (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No Results</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File has changed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The database file has changed. Do you want to load the changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>File opened in read only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock Database?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable safe saves?</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passwords</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save database as</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 2 Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Delete group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidget</name>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Different passwords supplied.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Tomorrow</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Apply generated password?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you want to apply the generated password to this entry?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry updated successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetAdvanced</name>
+    <message>
+        <source>Additional attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Protect</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reveal</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Foreground Color:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Background Color:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetAutoType</name>
+    <message>
+        <source>Enable Auto-Type for this entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>-</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Window title:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a specific sequence for this association:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetHistory</name>
+    <message>
+        <source>Show</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete all</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetMain</name>
+    <message>
+        <source>URL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Repeat:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Presets</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditGroupWidget</name>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Inherit from parent group (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditGroupWidgetMain</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Use default Auto-Type sequence of parent group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Set default Auto-Type se&amp;quence</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditWidgetIcons</name>
+    <message>
+        <source>&amp;Use default icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add custom icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete custom icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Download favicon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Custom icon already exists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm Delete</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Custom icon successfully downloaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>EditWidgetProperties</name>
+    <message>
+        <source>Created:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modified:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Accessed:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Uuid:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Plugin Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete plugin data?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to delete the selected plugin data?
+This may cause the affected plugins to malfunction.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Entry</name>
+    <message>
+        <source>%1 - Clone</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
+%1</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttributesModel</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryHistoryModel</name>
+    <message>
+        <source>Last modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryModel</name>
+    <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Accessed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryView</name>
+    <message>
+        <source>Customize View</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide Usernames</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide Passwords</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fit to window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fit to contents</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reset to defaults</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments (icon)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Group</name>
+    <message>
+        <source>Recycle Bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KMessageWidget</name>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close message</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeePass1OpenWidget</name>
+    <message>
+        <source>Import KeePass1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open the database.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeePass1Reader</name>
+    <message>
+        <source>Unable to read keyfile.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported encryption algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass database version.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Root</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key transformation failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group field type number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group id field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group creation time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group modification time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group expiry time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group level field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group field type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing group id or level</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing entry field type number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry modification time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry field type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeeShare</name>
+    <message>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
+    <message>
+        <source>Key Component</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Recent databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>E&amp;ntries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Tools</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;About</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Open database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Save database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Close database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Delete entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Edit group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Delete group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sa&amp;ve database as...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Clone entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy username to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy password to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password Generator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Lock databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy title to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy URL to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy notes to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Export to CSV file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Set up TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>E&amp;mpty recycle bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Toggle window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quit KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Donate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Report a &amp;bug</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy att&amp;ribute...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>OpenSSHKey</name>
+    <message>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Base64 decoding failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file way too small.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file magic header id invalid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Found zero keys</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read public key.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No private key payload to decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Trying to run KDF without cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF while reading private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key type: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cipher IV is too short for MD5 kdf</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown KDF: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown key type: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PasswordEditWidget</name>
+    <message>
+        <source>Enter password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Password cannot be empty.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passwords do not match.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate master password</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PasswordGeneratorWidget</name>
+    <message>
+        <source>%p%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character Types</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Upper Case Letters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lower Case Letters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Numbers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Special Characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude look-alike characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Pick characters from every group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Length:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passphrase</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wordlist:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Separator:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy: %1 bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password Quality: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Poor</source>
+        <comment>Password quality</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Weak</source>
+        <comment>Password quality</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Good</source>
+        <comment>Password quality</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excellent</source>
+        <comment>Password quality</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Database not opened</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database hash not available</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Client public key not received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot decrypt message</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>NULL device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>error reading from device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>malformed string</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>missing closing quote</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Last Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Press</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new random diceware passphrase.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word count for the diceware passphrase.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wordlist for the diceware generator.
+[Default: EFF English]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new random password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QtIOCompressor</name>
+    <message>
+        <source>Internal zlib error when compressing: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error writing to underlying device: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error opening underlying device: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading data from underlying device: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Internal zlib error when decompressing: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QtIOCompressor::open</name>
+    <message>
+        <source>The gzip format not supported in this version of zlib.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Internal zlib error: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SSHAgent</name>
+    <message>
+        <source>Agent connection failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Limit search to selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SettingsWidgetKeeShare</name>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Signer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Trust</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ask</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ShareObserver</name>
+    <message>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Always</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TotpDialog</name>
+    <message>
+        <source>Timed Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>000000</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"/>
+    </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></translation>
+    </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>There was an error creating the QR code.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Closing in %1 seconds.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TotpSetupDialog</name>
+    <message>
+        <source>Setup TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use custom settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Custom Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Time step:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>6 digits</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>7 digits</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>8 digits</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>UpdateCheckDialog</name>
+    <message>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WelcomeWidget</name>
+    <message>
+        <source>Start storing your passwords securely in a KeePassXC database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create new database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open existing database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from KeePass 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from CSV</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recent databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Welcome to KeePassXC %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>YubiKeyEditWidget</name>
+    <message>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>YubiKey Challenge-Response</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No YubiKey inserted.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+</TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_hu.ts b/share/translations/keepassx_hu.ts
index 8ad2b2747..7c51917d9 100644
--- a/share/translations/keepassx_hu.ts
+++ b/share/translations/keepassx_hu.ts
@@ -38,12 +38,6 @@
         <translation>Vágólapra másolás</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>Verzió: %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>Revízió: %1</translation>
     </message>
@@ -76,34 +70,48 @@ Kernel: %3 %4</translation>
         <translation>A KeePassXC fejlesztőcsapata ezúton külön köszönetet mond debfx-nek az eredetei KeePassX létrehozásáért.</translation>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
-        <translation>Build típusa: %1</translation>
+        <source>Version %1</source>
+        <translation>Verzió: %1</translation>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP hozzáférési engedély</translation>
+        <source>Build Type: %1</source>
+        <translation>Összeállítás típusa: %1</translation>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>Döntés megjegyzése</translation>
+        <source>Auto-Type</source>
+        <translation>Automatikus beírás</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Engedélyezés</translation>
+        <source>Browser Integration</source>
+        <translation>Böngészőintegráció</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>Megtagadás</translation>
+        <source>SSH Agent</source>
+        <translation>SSH ügynök</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>A %1 jelszóengedélyt kér a következő elem(ek) számára.
-Válassza ki, hogy engedélyezi-e a hozzáférést.</translation>
+        <source>YubiKey</source>
+        <translation>YubiKey</translation>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation>TouchID</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Nincs</translation>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -112,6 +120,277 @@ Válassza ki, hogy engedélyezi-e a hozzáférést.</translation>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>SSH ügynök engedélyezése (újraindítást igényel)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Alkalmazásbeállítások</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Általános</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Biztonság</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Hozzáférési hiba a beállítási fájlhoz: %1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Alapvető beállítások</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>Indítás</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>A KeePassXC többszörös indításának tiltása</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Utolsó adatbázis megjegyzése</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Az utolsó kulcsfájlok és biztonsági hardverkulcsok megjegyzése</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Előző adatbázisok betöltése indításkor</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>Indításkor az ablak kicsinyítése</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>Fájlkezelés</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation>Adatbázisok biztonságos mentése (lehet, hogy inkompatibilis a Dropbox-szal és hasonlókkal)</translation>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation>Készüljön biztonsági mentés az adatbázisról mentés előtt</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Automatikus mentés minden módosítás után</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Automatikus mentés kilépéskor</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Nem adatjellegű változások (pl. csoport lenyitása) esetén az adatbázis módosított állapotba kerülésének megakadályozása</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Külső módosításkor az adatbázis automatikus újratöltése</translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>Bejegyzéskezelés</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>A csoport ikonjának használata a bejegyzés létrehozásakor</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Kicsinyítés a vágólapra történő másoláskor</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation>A bejegyzés előnézeti panel elrejtése</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Általános</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation>Eszköztár (ikonok) elrejtése</translation>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation>Kilépés helyett minimalizálás</translation>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Rendszertálca-ikon megjelenítése</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>Sötét rendszertálca-ikon</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Az ablak rendszertálcára rejtése kicsinyítéskor</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Nyelv</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Automatikus beírás</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>Bejegyzések címének alkalmazása az ablakok illesztésénél a globális automatikus beírás számára. </translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>Bejegyzések URL-jének alkalmazása az ablakok illesztésénél a globális automatikus beírás számára. </translation>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>Mindig kérdezzen az automatikus beírás megkezdése előtt</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Globális automatikus beírás gyorsbillentyűje</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation>Automatikus beírás késleltetése</translation>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation>ms</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation>Automatikus beírás kezdésének késleltetése</translation>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>Időtúllépések</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>Vágólap törlése ennyi idő után</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> mp</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>Adatbázis zárolása ennyi inaktivitás után</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation>A TouchID elfelejtése ennyi tétlenség után:</translation>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>Kényelem</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Adatbázis zárolása munkamenet zárolásakor vagy a fedél lecsukásakor</translation>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation>A TouchID elfelejtése a munkamenet zárolásakor vagy a fedél lehajtásakor</translation>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>Adatbázis zárolása az ablak lekicsinyítésekor</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation>Az előzőleg zárolt adatbázis újbóli zárolása automatikus beírást követően</translation>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>Jelszóismétlés elkerülése látható jelszó esetén</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation>Szerkesztéskor ne rejtse el a jelszavakat</translation>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation>Na használjon helykitöltőt az üres jelszómezőknél</translation>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation>Jelszavak elrejtése a bejegyzés előnézeti panelen</translation>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>Bejegyzések jegyzeteinek elrejtése alapértelmezetten</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>Adatvédelem</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation>A DuckDuckGo használata tartalékként, a webhelyikonok letöltésére</translation>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -215,6 +494,27 @@ Válassza ki, hogy engedélyezi-e a hozzáférést.</translation>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation>KeePassXC-böngésző bejegyzés mentése</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Mégse</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation>Több adatbázis van nyitva.
+Válassza ki a helyes adatbázist a hitelesítő adatok mentéséhez.</translation>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -288,14 +588,6 @@ Válassza ki, hogy engedélyezi-e a hozzáférést.</translation>
         <translation>Illeszkedő hitelesítési adatok rendezése &amp;felhasználónév szerint</translation>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>Minden böngésző &amp;leválasztása</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>Minden tárolt hozzáférés törlése</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>Speciális</translation>
     </message>
@@ -361,14 +653,6 @@ Válassza ki, hogy engedélyezi-e a hozzáférést.</translation>
         <translation>&lt;b&gt;Figyelmeztetés:&lt;/b&gt; A következő beállítások veszélyesek lehetnek!</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>Végrehajtható fájlok (*.exe);;Minden fájl (*.*)</translation>
-    </message>
-    <message>
-        <source>Executable Files (*)</source>
-        <translation>Végrehajtható fájlok (*)</translation>
-    </message>
-    <message>
         <source>Select custom proxy location</source>
         <translation>Egyedi proxyhely kijelölése</translation>
     </message>
@@ -376,6 +660,31 @@ Válassza ki, hogy engedélyezi-e a hozzáférést.</translation>
         <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
         <translation>Sajnáljuk, de a KeePassXC-Browser pillanatnyilag nem támogatja a Snap kiadásokat.</translation>
     </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation>A böngészőintegráció működéséhez a KeePassXC-böngészőre van szükség. &lt;br /&gt;Letölthető ezen böngészőkre: %1 és %2.</translation>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation>&amp;Tor böngésző</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: </source>
+        <translation>&lt;b&gt;Figyelem&lt;/b&gt;, a keepassxc-proxy alkalmazás nem található!&lt;br /&gt;Ellenőrizze a KeePassXC telepítési könyvtárat, vagy erősítse meg az egyéni útvonalat a speciális beállításokban.&lt;br /&gt;A böngészőintegráció NEM FOG MŰKÖDNI a proxy alkalmazás nélkül.&lt;br /&gt;Várt útvonal:</translation>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation>Végrehajtható fájlok</translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation>Minden fájl</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"/>
+    </message>
 </context>
 <context>
     <name>BrowserService</name>
@@ -415,152 +724,46 @@ Valóban felülírható?</translation>
         <translation>Frissíti az információt ebben: %1 – %2?</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Adatbázis zárolva!</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Az aktív adatbázis zárolt.
-Fel kell oldani a kijelölt adatbázist, vagy egy másik nem zároltat kell választania.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Nincs ilyen beállítás!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation>Az aktív adatbázisban nincs beállítási bejegyzés.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Nincs találat a kulcsok között</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation>Nem található megosztott titkosítási kulcs a KeePassXC beállításaiban.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Kulcsok eltávolítva az adatbázisból</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation><numerusform>Sikeresen eltávolításra került %n titkosítási kulcs a KeePassXC beállításokból.</numerusform><numerusform>Sikeresen eltávolításra került %n titkosítási kulcs a KeePassXC beállításokból.</numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>Tárolt jogosultságok törlése…</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>Megszakítás</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Jogosultságok eltávolítva</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation><numerusform>Sikeresen el lett távolítva a jogosultság %n elemről.</numerusform><numerusform>Sikeresen el lett távolítva a jogosultság %n elemről.</numerusform></translation>
+        <source>Converting attributes to custom data…</source>
+        <translation>Attribútumok átalakítása egyéni adatokká…</translation>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Nem található bejegyzés ilyen jogosultsággal!</translation>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation>KeePassXC: Átalakított KeePassHTTP attribútumok</translation>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Az aktív adatbázisban nincs egyetlen jogosultsági bejegyzés sem.</translation>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation>Attribútumok sikeresen átalakítva %1 bejegyzésből.
+%2 kulcs áthelyezve az egyéni adatokhoz.</translation>
     </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>Jelszó</translation>
-    </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>Jelszó megadása:</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>Jelszó ismétlése:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;Kulcsfájl</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>Tallózás</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Létrehozás</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>Ki&amp;hívás-válasz</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Frissítés</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>Kulcsfájlok</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>Minden fájl</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>Kulcsfájl létrehozása…</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>Nem hozható létre kulcsfájl: </translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>Kulcsfájl kiválasztása</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Üres jelszó</translation>
-    </message>
-    <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>Valóban üres szöveget szeretne használni jelszóként?</translation>
-    </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>Eltérő jelszavak lettek megadva.</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation><numerusform>%n kulcs sikeresen áthelyezve az egyéni adatokhoz.</numerusform><numerusform>%n kulcs sikeresen áthelyezve az egyéni adatokhoz.</numerusform></translation>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>A(z) %1 kulcsfájl beállítása sikertelen:
-%2</translation>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation>KeePassXC: Nem található bejegyzés KeePassHTTP attribútumokkal!</translation>
     </message>
     <message>
-        <source>Legacy key file format</source>
-        <translation>Örökölt kulcsfájl formátum</translation>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation>Az aktív adatbázisban nincs egyetlen KeePassHTTP attribútumokat tartalmazó bejegyzés sem.</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>Egy régi, örökölt kulcsfájl formátumot használ, ami a közeljövőben már nem lesz támogatott.
-
-Megfontolandó egy új kulcsfájl készítése.</translation>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation>KeePassXC: Örökölt böngészőintegrációs beállítások észlelve</translation>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>A mesterkulcs módosítása sikertelen: nincs YubiKey behelyezve.</translation>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation>Örökölt böngészőintegrációs beállítások észlelve
+Frissíti a beállításokat a legfrissebb szabványra?
+Ez szükséges a böngészőbővítménnyel történő kompatibilitáshoz.</translation>
     </message>
 </context>
 <context>
@@ -641,14 +844,6 @@ Megfontolandó egy új kulcsfájl készítése.</translation>
         <translation>Nincs jelen a CSV-fájlban</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>Üres mezőnév</translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>oszlop</translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>CSV-fájlból importálva</translation>
     </message>
@@ -657,48 +852,85 @@ Megfontolandó egy új kulcsfájl készítése.</translation>
         <translation>Eredeti adatok:</translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>Hibák találhatók a CSV-fájlban!</translation>
+        <source>Error</source>
+        <translation>Hiba</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation>további üzenet mellőzve]</translation>
+        <source>Empty fieldname %1</source>
+        <translation>Üres mezőnév: %1</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Hiba</translation>
+        <source>column %1</source>
+        <translation>%1. oszlop</translation>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>CSV importálás: a mentés hibába ütközött:
-</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation>Hibák találhatók a CSV-fájlban!</translation>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>Hiba</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation><numerusform>[%n további üzenet mellőzve]</numerusform><numerusform>[%n további üzenet mellőzve]</numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Nem lehet kiszámítani a mesterkulcsot</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation>CSV importálás: a mentés hibába ütközött:
+%1</translation>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
-        <translation><numerusform>%n bájt, </numerusform><numerusform>%n bájt, </numerusform></translation>
+        <source>%n column(s)</source>
+        <translation><numerusform>%n oszlop</numerusform><numerusform>%n oszlop</numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation>%1, %2, %3</translation>
     </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
-        <translation><numerusform>%n sor, </numerusform><numerusform>%n sor, </numerusform></translation>
+        <source>%n byte(s)</source>
+        <translation><numerusform>%n bájt</numerusform><numerusform>%n bájt</numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
-        <translation><numerusform>%n oszlop</numerusform><numerusform>%n oszlop</numerusform></translation>
+        <source>%n row(s)</source>
+        <translation><numerusform>%n sor</numerusform><numerusform>%n sor</numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Gyökér</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>A(z) %1 fájl nem létezik</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>A(z) %1 fájl nem nyitható meg.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation>Hiba az adatbázis megnyitásakor: %1</translation>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation>Nem menthető, az adatbázisnak nincs fájlneve.</translation>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation>A fájlba nem lehet írni, mert csak olvasható módban van megnyitva.</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation>Adatbázis feloldása – KeePassXC</translation>
     </message>
 </context>
 <context>
@@ -728,14 +960,6 @@ Megfontolandó egy új kulcsfájl készítése.</translation>
         <translation>Kihívás-válasz:</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Nem lehet megnyitni az adatbázist.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Nem lehet megnyitni a kulcsfájlt</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation>Örökölt kulcsfájl formátum</translation>
     </message>
@@ -764,53 +988,254 @@ Megfontolandó egy új kulcsfájl készítése.</translation>
         <source>Select key file</source>
         <translation>Kulcsfájl kiválasztása</translation>
     </message>
+    <message>
+        <source>TouchID for quick unlock</source>
+        <translation>TouchID a gyors feloldáshoz</translation>
+    </message>
+    <message>
+        <source>Unable to open the database:
+%1</source>
+        <translation>Az adatbázis nem nyitható meg:
+%1</translation>
+    </message>
+    <message>
+        <source>Can't open key file:
+%1</source>
+        <translation>A kulcsfájl nem nyitható meg:
+%1</translation>
+    </message>
 </context>
 <context>
-    <name>DatabaseRepairWidget</name>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Repair database</source>
-        <translation>Adatbázis javítása</translation>
+        <source>Passwords</source>
+        <translation>Jelszavak</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
     <message>
-        <source>Error</source>
-        <translation>Hiba</translation>
+        <source>Advanced Settings</source>
+        <translation>Speciális beállítások</translation>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Nem lehet megnyitni a kulcsfájlt</translation>
+        <source>General</source>
+        <translation>Általános</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Nem lehet megnyitni az adatbázist.</translation>
+        <source>Security</source>
+        <translation>Biztonság</translation>
+    </message>
+    <message>
+        <source>Master Key</source>
+        <translation>Mesterkulcs</translation>
+    </message>
+    <message>
+        <source>Encryption Settings</source>
+        <translation>Titkosítási beállítások</translation>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation>Böngészőintegráció</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetBrowser</name>
+    <message>
+        <source>KeePassXC-Browser settings</source>
+        <translation>KeePassXC-böngésző beállítások</translation>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>Minden böngésző &amp;leválasztása</translation>
+    </message>
+    <message>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation>A bejegyzések összes oldalfüggő beállításának &amp;elfelejtése</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation>HTTP attribútumok áthelyezése a KeePassXC-böngésző &amp;egyéni adatokhoz</translation>
+    </message>
+    <message>
+        <source>Stored keys</source>
+        <translation>Tárolt kulcsok</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Eltávolítás</translation>
+    </message>
+    <message>
+        <source>Delete the selected key?</source>
+        <translation>Törli a kiválasztott kulcsot?</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation>Valóban törli a kiválasztott kulcsot?
+Ez megakadályozhatja a böngésző bővítményhez történő kapcsolódást.</translation>
+    </message>
+    <message>
+        <source>Key</source>
+        <translation>Kulcs</translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation>Érték</translation>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation>Engedélyezze a böngészőintegrációt ezekhez a beállításokhoz.</translation>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation>Minden böngésző leválasztása</translation>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation>Valóban leválasztja az összes böngészőt?
+Ez megakadályozhatja a böngésző bővítményhez történő kapcsolódást.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Nincs találat a kulcsok között</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation>Nem található megosztott titkosítási kulcs a KeePassXC beállításaiban.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Kulcsok eltávolítva az adatbázisból</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation><numerusform>Sikeresen eltávolításra került %n titkosítási kulcs a KeePassXC beállításokból.</numerusform><numerusform>Sikeresen eltávolításra került %n titkosítási kulcs a KeePassXC beállításokból.</numerusform></translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Az adatbázis megnyitása sikeres. Nincs további teendő.</translation>
+        <source>Forget all site-specific settings on entries</source>
+        <translation>A bejegyzések összes oldalfüggő beállításának elfelejtése</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>Sikeres</translation>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation>Valóban elfelejti az összes oldalfüggő beállítást az összes bejegyzésnél?
+A bejegyzések elérési engedélyei vissza lesznek vonva. </translation>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>Az adatbázis sikeresen meg lett javítva.
-Most már el lehet menteni.</translation>
+        <source>Removing stored permissions…</source>
+        <translation>Tárolt jogosultságok törlése…</translation>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>Nem lehet megjavítani az adatbázist.</translation>
+        <source>Abort</source>
+        <translation>Megszakítás</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Jogosultságok eltávolítva</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation><numerusform>Sikeresen el lett távolítva a jogosultság %n elemről.</numerusform><numerusform>Sikeresen el lett távolítva a jogosultság %n elemről.</numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: Nem található bejegyzés ilyen jogosultsággal!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Az aktív adatbázisban nincs egyetlen jogosultsági bejegyzés sem.</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation>HTTP attribútumok áthelyezése az egyéni adatokhoz</translation>
+    </message>
+    <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>Valóban átállítja az összes örökölt böngészőintegrációs adatot a legfrissebb szabványra?
+Ez szükséges a böngészőbővítmény kompatibilitásának fenntartásához.</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetEncryption</name>
     <message>
-        <source>General</source>
-        <translation>Általános</translation>
+        <source>Encryption Algorithm:</source>
+        <translation>Titkosítási algoritmus:</translation>
+    </message>
+    <message>
+        <source>AES:  256 Bit   (default)</source>
+        <translation>AES:  256 Bit   (alapértelmezett)</translation>
+    </message>
+    <message>
+        <source>Twofish:  256 Bit</source>
+        <translation>Twofish:  256 bit</translation>
+    </message>
+    <message>
+        <source>Key Derivation Function:</source>
+        <translation>Kulcsszármaztatási függvény:</translation>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation>Átalakítási fordulók száma:</translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation>Egy másodperces késleltetésű teljesítményvizsgálat</translation>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation>Memóriahasználat:</translation>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation>Párhozamosság:</translation>
+    </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation>Visszafejtés ideje:</translation>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation>?? s</translation>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>Titkosítás</translation>
+        <source>Change</source>
+        <translation>Módosítása</translation>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation>100 ms</translation>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation>5 s</translation>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation>A magasabb értékek nagyobb védelmet adnak, de az adatbázis megnyitása tovább fog tartani.</translation>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation>Adatbázis-formátum:</translation>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation>Ez csak akkor fontos, ha más programokkal is kell használnia az adatbázisát.</translation>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation>KDBX 4.0 (ajánlott)</translation>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation>KDBX 3.1</translation>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation>változatlan</translation>
     </message>
     <message>
         <source>Number of rounds too high</source>
@@ -864,40 +1289,15 @@ Ezt a számot megtartva az adatbázis nagyon könnyen törhető lesz.</translati
         <comment>Threads for parallel execution (KDF settings)</comment>
         <translation><numerusform>szál</numerusform><numerusform>szál</numerusform></translation>
     </message>
-</context>
-<context>
-    <name>DatabaseSettingsWidgetEncryption</name>
-    <message>
-        <source>Encryption Algorithm:</source>
-        <translation>Titkosítási algoritmus:</translation>
-    </message>
-    <message>
-        <source>AES:  256 Bit   (default)</source>
-        <translation>AES:  256 Bit   (alapértelmezett)</translation>
-    </message>
-    <message>
-        <source>Twofish:  256 Bit</source>
-        <translation>Twofish:  256 bit</translation>
-    </message>
-    <message>
-        <source>Key Derivation Function:</source>
-        <translation>Kulcsszármaztatási függvény:</translation>
-    </message>
-    <message>
-        <source>Transform rounds:</source>
-        <translation>Átalakítási fordulók száma:</translation>
-    </message>
-    <message>
-        <source>Benchmark 1-second delay</source>
-        <translation>Egy másodperces késleltetésű teljesítményvizsgálat</translation>
-    </message>
-    <message>
-        <source>Memory Usage:</source>
-        <translation>Memóriahasználat:</translation>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation><numerusform>%1 ms</numerusform><numerusform>%1 ms</numerusform></translation>
     </message>
-    <message>
-        <source>Parallelism:</source>
-        <translation>Párhozamosság:</translation>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform></translation>
     </message>
 </context>
 <context>
@@ -948,91 +1348,112 @@ Ezt a számot megtartva az adatbázis nagyon könnyen törhető lesz.</translati
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>Gyökér</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 adatbázis</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Minden fájl</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Adatbázis megnyitása</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>A fájl nem található!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Nem lehet megnyitni az adatbázist.</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>Fájl megnyitva csak olvashatóként</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>CSV-fájl megnyitása</translation>
+        <source>Add additional protection...</source>
+        <translation>További védelem hozzáadása…</translation>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>CSV-fájl</translation>
+        <source>No encryption key added</source>
+        <translation>Nincs titkosítási kulcs hozzáadva</translation>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>Minden fájl (*)</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation>Legalább egy titkosítási kulcsot hozzá kell adni, hogy megvédje az adatbázisát!</translation>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Adatbázis egyesítése</translation>
+        <source>No password set</source>
+        <translation>Nincs jelszó megadva</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>KeePass 1 adatbázis megnyitása</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>FIGYELEM! Nem állított be jelszót! Az adatbázis jelszó nélküli használata erősen ellenjavallt!
+
+Valóban jelszó nélkül folytatja?</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1 adatbázis</translation>
+        <source>Unknown error</source>
+        <translation>Ismeretlen hiba</translation>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>Bezárja?</translation>
+        <source>Failed to change master key</source>
+        <translation>A mesterkulcs módosítása meghiúsult</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>A(z) „%1” szerkesztési módban van.
-Elveti a módosításokat és mindenképp bezárja? </translation>
+        <source>Database Name:</source>
+        <translation>Adatbázis neve:</translation>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>Menti a módosításokat?</translation>
+        <source>Description:</source>
+        <translation>Leírás:</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>A(z) „%1” módosítva lett.
-Menti a módosításokat?</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 adatbázis</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Az adatbázis kiírása sikertelen.</translation>
+        <source>All files</source>
+        <translation>Minden fájl</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Jelszavak</translation>
+        <source>Open database</source>
+        <translation>Adatbázis megnyitása</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Adatbázis mentése más néven</translation>
+        <source>CSV file</source>
+        <translation>CSV-fájl</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>Adatbázis egyesítése</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>KeePass 1 adatbázis megnyitása</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 adatbázis</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1043,40 +1464,41 @@ Menti a módosításokat?</translation>
         <translation>A CSV-fájl mentése sikertelen.</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>Új adatbázis</translation>
+        <source>Database creation error</source>
+        <translation>Adatbázis létrehozási hiba</translation>
     </message>
     <message>
-        <source>locked</source>
-        <translation>zárolva</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>A létrehozott adatbázisnak nincs kulcsa vagy KDF-e, a mentés megtagadva.
+Ez határozottan hiba, jelentse a fejlesztőknek.</translation>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>Adatbázis zárolása</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation>Az adatbázisfájl nem létezik, vagy nem lehet hozzáférni.</translation>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>Nem lehet zárolni az adatbázist, mivel jelenleg azt szerkeszti.
-Nyomja meg a „Mégse” gombot a módosítások befejezéshez vagy dobja el azokat.</translation>
+        <source>Select CSV file</source>
+        <translation>Válasszon CSV-fájlt</translation>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>Ez az adatbázis módosítva lett.
-Szeretné elmenteni az adatbázist zárolás előtt?
-Különben a módosítások elvesznek.</translation>
+        <source>New Database</source>
+        <translation>Új adatbázis</translation>
     </message>
     <message>
-        <source>Disable safe saves?</source>
-        <translation>Letiltható a biztonságos mentés?</translation>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Új adatbázis]</translation>
     </message>
     <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>A KeePassXC többször is hiába próbálta meg elmenteni az adatbázist. Ez jellemzően azért szokott előfordulni, mert egy szinkronizáló szolgáltatás zárolja a mentendő fájl.
-Letiltható a biztonságos mentés és úgy megkísérelhető a mentés?</translation>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Zárolva]</translation>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Csak olvasható]</translation>
     </message>
 </context>
 <context>
@@ -1086,37 +1508,13 @@ Letiltható a biztonságos mentés és úgy megkísérelhető a mentés?</transl
         <translation>Keresés…</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>Mesterkulcs módosítása</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>Törli a bejegyzést?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>Valóban végleg szeretné törölni a bejegyzést: „%1”?</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Törli a bejegyzéseket?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Valóban végleg szeretne törölni %1 bejegyzést?</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Kukába dobja a bejegyzést?</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation>Valóban kukába szeretné dobni a bejegyzést: „%1”?</translation>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Kukába dobja a bejegyzéseket?</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation><numerusform>Valóban a kukába szeretne dobni %n elemet?</numerusform><numerusform>Valóban a kukába szeretne dobni %n elemet?</numerusform></translation>
@@ -1134,18 +1532,10 @@ Letiltható a biztonságos mentés és úgy megkísérelhető a mentés?</transl
         <translation>Válasz megjegyzése</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Törli a csoportot?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>Valóban végleg szeretné törölni a csoportot: „%1”?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Nem lehet kiszámítani a mesterkulcsot</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>Nincs aktuális adatbázis.</translation>
     </message>
@@ -1180,10 +1570,6 @@ Do you want to merge your changes?</source>
 Egyesíti a módosításokat?</translation>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>Nem lehet megnyitni az új adatbázisfájlt ennek az adatbázisnak az automatikus újranyitási kísérlete közben.</translation>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>Kuka ürítése?</translation>
     </message>
@@ -1191,88 +1577,107 @@ Egyesíti a módosításokat?</translation>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>Valóban véglegesen töröl mindent a kukából?</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>TOTP jelsor előállítása</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation><numerusform>Valóban végleg szeretné törölni a(z) %n bejegyzést?</numerusform><numerusform>Valóban végleg szeretné törölni a(z) %n bejegyzést?</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation><numerusform>Törli az bejegyzést?</numerusform><numerusform>Törli az bejegyzéseket?</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation><numerusform>Kukába dobja a bejegyzést?</numerusform><numerusform>Kukába dobja a bejegyzéseket?</numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Bezárás</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Fájl megnyitva csak olvashatóként</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Általános</translation>
+        <source>Lock Database?</source>
+        <translation>Zárolja az adatbázist?</translation>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Jelszó</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation>Egy bejegyzést szerkeszt. Elveti a változásokat, és mindenképp zárolja?</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>A(z) „%1” módosítva lett.
+Menti a módosításokat?</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>Lejárat</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation>Az adatbázis módosítva lett.
+Menti a változásokat?</translation>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Felhasználónév</translation>
+        <source>Save changes?</source>
+        <translation>Menti a módosításokat?</translation>
     </message>
     <message>
-        <source>Autotype</source>
-        <translation>Automatikus típus</translation>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation>Nem lehet megnyitni az új adatbázisfájlt egy újranyitási kísérlet közben.
+Hiba: %1</translation>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>Keresés</translation>
+        <source>Disable safe saves?</source>
+        <translation>Letiltható a biztonságos mentés?</translation>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>Attribútumok</translation>
+        <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>A KeePassXC többször is hiába próbálta meg elmenteni az adatbázist. Ez jellemzően azért szokott előfordulni, mert egy szinkronizáló szolgáltatás zárolja a mentendő fájl.
+Letiltható a biztonságos mentés és úgy megkísérelhető a mentés?</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Mellékletek</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation>Az adatbázis írása meghiúsult.
+%1</translation>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Jegyzetek</translation>
+        <source>Passwords</source>
+        <translation>Jelszavak</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>Ablak</translation>
+        <source>Save database as</source>
+        <translation>Adatbázis mentése más néven</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>Sorrend</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 adatbázis</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Keresés</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Törlés</translation>
+        <source>Delete group</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Never</source>
-        <translation>Soha</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[VÉDETT]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>Tiltott</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Engedélyezett</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1346,22 +1751,10 @@ Egyesíti a módosításokat?</translation>
         <translation>Új attribútum</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Törlés megerősítése</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>Valóban eltávolítja ezt az attribútumot?</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[VÉDETT]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation>A megjelenítés vagy a szerkesztés a „Felfedés” gombbal érhető el</translation>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>Holnap</translation>
     </message>
@@ -1374,10 +1767,6 @@ Egyesíti a módosításokat?</translation>
         <translation><numerusform>%n hónap</numerusform><numerusform>%n hónap</numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 év</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation>Alkalmazható az előállított jelszó?</translation>
     </message>
@@ -1389,6 +1778,26 @@ Egyesíti a módosításokat?</translation>
         <source>Entry updated successfully.</source>
         <translation>Bejegyzés sikeresen frissítve.</translation>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation>A bejegyzésnek mentetlen változásai vannak</translation>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation>Új %1 attribútum</translation>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation>[VÉDETT] A megjelenítés vagy a szerkesztés a „Felfedés” gombbal érhető el</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n év</numerusform><numerusform>%n év</numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1634,6 +2043,81 @@ Egyesíti a módosításokat?</translation>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>Űrlap</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Jelszó:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1691,10 +2175,6 @@ Egyesíti a módosításokat?</translation>
         <translation>A favicon letöltése sikertelen.</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Tipp: A Google-t tartalékként az Eszközök&gt;Beállítások&gt;Biztonság menüpontban engedélyezheti</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>Képek</translation>
     </message>
@@ -1703,14 +2183,6 @@ Egyesíti a módosításokat?</translation>
         <translation>Minden fájl</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Kép kiválasztása</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read icon</source>
-        <translation>Az ikon nem olvasható</translation>
-    </message>
-    <message>
         <source>Custom icon already exists</source>
         <translation>Az egyéni ikon már létezik</translation>
     </message>
@@ -1719,8 +2191,36 @@ Egyesíti a módosításokat?</translation>
         <translation>Törlés megerősítése</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>Ezt az ikont %1 elem használja, és le lesz cserélve az alapértelmezett ikonra. Valóban törli?</translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation>Egyéni ikon sikeresen letöltve</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>Tipp: A DuckDuckGót tartalékként az Eszközök&gt;Beállítások&gt;Biztonság menüpontban engedélyezheti</translation>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation>Kép kiválasztása</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation><numerusform>%1 / %n ikon sikeresen betöltve</numerusform><numerusform>%1 / %n ikon sikeresen betöltve</numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation>Egy ikon sem lett betöltve</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation><numerusform>%n ikon már létezik az adatbázisban</numerusform><numerusform>%n ikon már létezik az adatbázisban</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation><numerusform>A következő ikonnál hiba történt:</numerusform><numerusform>A következő ikonoknál hiba történt:</numerusform></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>Ezt az ikont %n elem használja, és le lesz cserélve az alapértelmezett ikonra. Valóban törli?</numerusform><numerusform>Ezt az ikont %n elem használja, és le lesz cserélve az alapértelmezett ikonra. Valóban törli?</numerusform></translation>
     </message>
 </context>
 <context>
@@ -1771,9 +2271,8 @@ Ez a kijelölt bővítmény hibás működését eredményezheti.</translation>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation> - klón</translation>
+        <source>%1 - Clone</source>
+        <translation>%1 – Klónozás</translation>
     </message>
 </context>
 <context>
@@ -1818,10 +2317,6 @@ Ez a kijelölt bővítmény hibás működését eredményezheti.</translation>
         <translation><numerusform>Valóban eltávolít %n mellékletet?</numerusform><numerusform>Valóban eltávolít %n mellékletet?</numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Törlés megerősítése</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>Mellékletek mentése</translation>
     </message>
@@ -1858,10 +2353,13 @@ Ez a kijelölt bővítmény hibás működését eredményezheti.</translation>
 %1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation>Törlés megerősítése</translation>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>A fájlok nem megnyithatóak:
-%1</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1945,6 +2443,106 @@ Ez a kijelölt bővítmény hibás működését eredményezheti.</translation>
         <source>Attachments</source>
         <translation>Mellékletek</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>Igen</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>TOTP jelsor előállítása</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Bezárás</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Általános</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Felhasználónév</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Jelszó</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Lejárat</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>Attribútumok</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Mellékletek</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Jegyzetek</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Automatikus típus</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Ablak</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Sorrend</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Keresés</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Keresés</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Törlés</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Soha</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[VÉDETT]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Engedélyezett</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Tiltott</translation>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EntryView</name>
@@ -1983,6 +2581,19 @@ Ez a kijelölt bővítmény hibás működését eredményezheti.</translation>
         <source>Recycle Bin</source>
         <translation>Kuka</translation>
     </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation>[üres]</translation>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>HostInstaller</name>
@@ -1996,61 +2607,6 @@ Ez a kijelölt bővítmény hibás működését eredményezheti.</translation>
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>Hosszúság:</translation>
-    </message>
-    <message>
-        <source>Character Types</source>
-        <translation>Karaktertípusok</translation>
-    </message>
-    <message>
-        <source>Upper Case Letters</source>
-        <translation>Nagybetűk</translation>
-    </message>
-    <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
-    </message>
-    <message>
-        <source>Lower Case Letters</source>
-        <translation>Kisbetűk</translation>
-    </message>
-    <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
-    </message>
-    <message>
-        <source>Numbers</source>
-        <translation>Számok</translation>
-    </message>
-    <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
-    </message>
-    <message>
-        <source>Special Characters</source>
-        <translation>Speciális karakterek</translation>
-    </message>
-    <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; …</translation>
-    </message>
-    <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Hasonlóan kinéző karakterek kizárása</translation>
-    </message>
-    <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>Legyen a jelszóban minden csoportból karakter</translation>
-    </message>
-    <message>
-        <source>Extended ASCII</source>
-        <translation>Bővített ASCII</translation>
-    </message>
-</context>
-<context>
     <name>KMessageWidget</name>
     <message>
         <source>&amp;Close</source>
@@ -2075,6 +2631,26 @@ Ez a kijelölt bővítmény hibás működését eredményezheti.</translation>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Rossz kulcs vagy sérült adatbázisfájl.</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation>hiányzó adatbázis fejlécek</translation>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation>A fejléc nem egyezik meg a hash értékkel</translation>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>Érvénytelen fejléc-azonosító méret</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>Érvénytelen fejlécmezőhossz</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>Érvénytelen fejlécadathossz</translation>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2234,10 +2810,6 @@ Ez a kijelölt bővítmény hibás működését eredményezheti.</translation>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation>Érvénytelen titkosító UUID-hossz</translation>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation>Nem támogatott titkosító</translation>
     </message>
@@ -2291,6 +2863,18 @@ Ez egyirányú migráció. Nem lehet majd megnyitni az importált adatbázist a
         <source>Unsupported KeePass 2 database version.</source>
         <translation>Nem támogatott KeePass 2 adatbázis-verzió.</translation>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation>Érvénytelen titkosítási UUID hossz: %1 (hossz=%2)</translation>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation>A UUID nem dolgozható fel: %1</translation>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2363,10 +2947,6 @@ Ez egyirányú migráció. Nem lehet majd megnyitni az importált adatbázist a
         <translation>Előzményelem különböző UUID-vel</translation>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation>Bejegyzés karakterlánca nem visszafejthető</translation>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation>Kétszeres egyéni attribútum található</translation>
     </message>
@@ -2415,6 +2995,14 @@ Ez egyirányú migráció. Nem lehet majd megnyitni az importált adatbázist a
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation>A bináris nem kibontható</translation>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation>XML hiba
+%1
+%2. sor, %3. oszlop</translation>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2578,28 +3166,129 @@ Ez egyirányú migráció. Nem lehet majd megnyitni az importált adatbázist a
         <source>Invalid entry field type</source>
         <translation>Érvénytelen bejegyzésmező-típus</translation>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation>nem lehet a tartalom pozíciójához lépni</translation>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>A meglévő egypéldányos zárolási fájl érvénytelen. Új példány indítása.</translation>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>A zárolási fájlt nem lehet létrehozni. Egyedi példány mód letiltva.</translation>
+        <source>Import from</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>A KeePassXC egy másik példánya is fut.</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Végzetes hiba a kriptográfiai funkciók tesztelése közben.</translation>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC – Hiba</translation>
+        <source>Key Component</source>
+        <translation>Kulcs komponens</translation>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation>Kulcs komponens leírása</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Mégse</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation>Kulcs komponens beállítva, kattintson a módosításhoz vagy eltávolításhoz</translation>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation>%1 hozzáadása</translation>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation>%1 módosítása</translation>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation>%1 eltávolítása</translation>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation>%1 beállítva, kattintson a módosításhoz vagy eltávolításhoz</translation>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>Tallózás</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Előállítás</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation>Kulcsfájl</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;Megadhat egy véletlenszerű bájtokat tartalmazó kulcsot a további biztonság érdekében.&lt;/p&gt;&lt;p&gt;Tartsa titokban, és ne veszítse el, nehogy kizárja magát!&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation>Örökölt kulcsfájl formátum</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>Egy régi, örökölt kulcsfájl formátumot használ, ami a közeljövőben már nem lesz támogatott.
+
+Ugorjon a mesterkulcs beállításokhoz, és állítson elő egy új kulcsfájlt.</translation>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation>Hiba a(z) „%1” kulcsfájl betöltésekor
+Üzenet: %2</translation>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Kulcsfájlok</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Minden fájl</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Kulcsfájl létrehozása…</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation>Hiba a kulcsfájl létrehozásakor</translation>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation>A kulcsfájl nem hozható létre: %1</translation>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Kulcsfájl kiválasztása</translation>
     </message>
 </context>
 <context>
@@ -2613,10 +3302,6 @@ Ez egyirányú migráció. Nem lehet majd megnyitni az importált adatbázist a
         <translation>&amp;Friss adatbázisok</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Importálás</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation>&amp;Súgó</translation>
     </message>
@@ -2625,14 +3310,6 @@ Ez egyirányú migráció. Nem lehet majd megnyitni az importált adatbázist a
         <translation>Be&amp;jegyzések</translation>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>&amp;Attribútum másolása a vágólapra</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation>Időalapú, egyszer használatos jelszó</translation>
-    </message>
-    <message>
         <source>&amp;Groups</source>
         <translation>Cso&amp;portok</translation>
     </message>
@@ -2661,30 +3338,10 @@ Ez egyirányú migráció. Nem lehet majd megnyitni az importált adatbázist a
         <translation>Adatbázis &amp;bezárása</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>Ú&amp;j adatbázis</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>Egyesítés KeePassX adatbázisból</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>Új bejegyzés &amp;hozzáadása</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>Bejegyzés &amp;megtekintése/szerkesztése</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>Bejegyzés &amp;törlése</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>Új cso&amp;port hozzáadása</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>Csoport sz&amp;erkesztése</translation>
     </message>
@@ -2697,14 +3354,6 @@ Ez egyirányú migráció. Nem lehet majd megnyitni az importált adatbázist a
         <translation>Adatbázis mentése más &amp;néven…</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>&amp;Mesterkulcs módosítása…</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>Adatbázis-&amp;beállítások</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>Adatbázis-beállítások</translation>
     </message>
@@ -2713,10 +3362,6 @@ Ez egyirányú migráció. Nem lehet majd megnyitni az importált adatbázist a
         <translation>Bejegyzés &amp;klónozása</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>&amp;Keresés</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>&amp;Felhasználónév másolása</translation>
     </message>
@@ -2725,10 +3370,6 @@ Ez egyirányú migráció. Nem lehet majd megnyitni az importált adatbázist a
         <translation>Felhasználónév másolása a vágólapra</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>&amp;Jelszó másolása</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>Jelszó másolása a vágólapra</translation>
     </message>
@@ -2741,14 +3382,6 @@ Ez egyirányú migráció. Nem lehet majd megnyitni az importált adatbázist a
         <translation>Jelszógenerátor</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation>&amp;Automatikus beírás</translation>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>&amp;URL megnyitása</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>Adatbázisok &amp;zárolása</translation>
     </message>
@@ -2781,22 +3414,6 @@ Ez egyirányú migráció. Nem lehet majd megnyitni az importált adatbázist a
         <translation>&amp;Exportálás CSV-fájlba…</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>KeePass 1 adatbázis importálása…</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>CSV-fájl importálása…</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Adatbázis &amp;javítása…</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>TOTP megjelenítése</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>TOTP beállítása…</translation>
     </message>
@@ -2817,14 +3434,6 @@ Ez egyirányú migráció. Nem lehet majd megnyitni az importált adatbázist a
         <translation>Hozzáférési hiba a beállítási fájlhoz: %1</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Úgy tűnik, hogy a böngészőintegrációt a KeePassHTTP látja el. A támogatása hamarosan lejár és a jövőben eltávolításra kerül. &lt;br&gt;Javasolt váltani a KeePassXC-Browser kiegészítőre! A költözéshez hasznos lehet a &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;költözési útmutató&lt;/a&gt; (%1 figyelmeztetés a 3-ból).&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>csak olvasható</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Beállítások</translation>
     </message>
@@ -2837,35 +3446,277 @@ Ez egyirányú migráció. Nem lehet majd megnyitni az importált adatbázist a
         <translation>Kilépés a KeePassXC-ből</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 adatbázis</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Meg kell érinteni a gombot a YubiKeyen!</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Minden fájl</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation>FIGYELEM: Egy instabil KeePassXC verziót használ! Mivel magas kockázata van az adatsérülésnek, feltétlenül érdemes biztonsági mentés készíteni az adatbázisról.
+Ez a verzió nem felhasználóknak készült.</translation>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Adatbázis megnyitása</translation>
+        <source>&amp;Donate</source>
+        <translation>&amp;Támogatás</translation>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Javított adatbázis mentése</translation>
+        <source>Report a &amp;bug</source>
+        <translation>&amp;Hiba jelentése</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Az adatbázis kiírása sikertelen.</translation>
+        <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>FIGYELMEZTETÉS: A Qt verziója miatt a KeePassXC összeomolhat egy képernyő-billentyűzettel!
+Javasoljuk az AppImage alkalmazását, amely elérhető a letöltések oldalon.</translation>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Meg kell érinteni a gombot a YubiKeyen!</translation>
+        <source>&amp;Import</source>
+        <translation>&amp;Importálás</translation>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
-        <translation>FIGYELEM: Egy instabil KeePassXC verziót használ! Mivel magas kockázata van az adatsérülésnek, feltétlenül érdemes biztonsági mentés készíteni az adatbázisról.
-Ez a verzió nem felhasználóknak készült.</translation>
+        <source>Copy att&amp;ribute...</source>
+        <translation>Att&amp;ribútum másolása…</translation>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation>TOTP…</translation>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation>Ú&amp;j adatbázis…</translation>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation>Új adatbázis létrehozása</translation>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation>&amp;Egyesítés adatbázisból…</translation>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation>Egyesítés egy másik KeePassX adatbázisból</translation>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation>Ú&amp;j bejegyzés</translation>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation>Új bejegyzés hozzáadása</translation>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation>Bejegyzés sz&amp;erkesztése</translation>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation>Bejegyzés megtekintése vagy szerkesztése</translation>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation>Ú&amp;j csoport</translation>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation>Új csoport hozzáadása</translation>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation>&amp;Mesterkulcs módosítása…</translation>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation>&amp;Adatbázis-beállítások…</translation>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation>&amp;Jelszó másolása</translation>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation>&amp;Automatikus beírás</translation>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation>&amp;URL megnyitása</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation>KeePass 1 adatbázis…</translation>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation>KeePass 1 adatbázis importálása</translation>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation>CSV-fájl…</translation>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation>CSV-fájl importálása</translation>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation>TOTP megjelenítése…</translation>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation>TOTP QR-kód megjelenítése…</translation>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation>Hiányzó %1 létrehozása [%2]</translation>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation>%1 áthelyezése [%2]</translation>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation>%1 felülírása [%2]</translation>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation>régebbi bejegyzés összeolvasztva a(z) „%1” adatbázisból</translation>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation>Biztonsági mentés hozzáadása a régebbi %1 célhoz [%2]</translation>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation>Biztonsági mentés hozzáadása a régebbi %1 forráshoz [%2]</translation>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation>A régebbi cél újra alkalmazása az újabb %1 forráson [%2]</translation>
+    </message>
+    <message>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation>A régebbi forrás újra alkalmazása az újabb %1 célon [%2]</translation>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation>Szinkronizálás az újabb %1 forrásból [%2]</translation>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation>Szinkronizálás a régebbi %1 forrásból [%2]</translation>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation>%1 gyermek törlése [%2]</translation>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation>%1 elárvult bejegyzés törlése [%2]</translation>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation>Törölt objektumok módosítva</translation>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation>Hiányzó %1 ikon hozzáadása</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation>Új KeePassXC adatbázis létrehozása…</translation>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Gyökér</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>Varázsló oldal</translation>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation>&amp;Titkosítási beállítások</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>Itt állíthatja be az adatbázis titkosítási beállításokat. Ne aggódjon, később is megváltoztathatja az adatbázis-beállításokban.</translation>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Speciális beállítások</translation>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation>Egyszerű beállítások</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <translation>Titkosítási beállítások</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>Itt állíthatja be az adatbázis titkosítási beállításokat. Ne aggódjon, később is megváltoztathatja az adatbázis-beállításokban.</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation>Adatbázis mesterkulcs</translation>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation>A csak Ön által ismert mesterkulcs védi az adatbázisát.</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <translation>Általános adatbázis-információk</translation>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation>Töltse ki a megjelenítendő nevet és a nem kötelező leírást az új adatbázishoz:</translation>
     </message>
 </context>
 <context>
@@ -2968,125 +3819,34 @@ Ez a verzió nem felhasználóknak készült.</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation>Párbeszédablak</translation>
-    </message>
-    <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>Ez szükséges az adatbázis ChromeIPassból vagy PassIFoxból történő eléréséhez</translation>
-    </message>
-    <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>KeePassHTTP kiszolgáló engedélyezése</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Általános</translation>
-    </message>
-    <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>É&amp;rtesítés megjelenítése hitelesítési adatok kérésekor</translation>
-    </message>
-    <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>Egy konkrét URL-hez tartozó legjobb találatokat adja vissza, a teljes domainhoz tartozó összes bejegyzés helyett.</translation>
-    </message>
-    <message>
-        <source>&amp;Return only best matching entries</source>
-        <translation>Csak a &amp;legjobb találatok visszaadása</translation>
-    </message>
-    <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Adatbázis feloldási &amp;kérelem, ha zárolva van</translation>
-    </message>
-    <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation>Csak az azonos sémájú (http://, https://, ftp://, …) bejegyzések visszaadása.</translation>
-    </message>
-    <message>
-        <source>&amp;Match URL schemes</source>
-        <translation>&amp;URL sémákra illeszkedés</translation>
-    </message>
-    <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Találatok rendezése &amp;felhasználónév szerint</translation>
-    </message>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Találatok rendezése &amp;cím szerint</translation>
-    </message>
-    <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>Az összes megosztott titkosítási kulcs &amp;eltávolítása az aktív adatbázisból</translation>
-    </message>
-    <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>Az összes tárolt bejegyzés jogosultságának &amp;törlése az aktív adatbázisból</translation>
-    </message>
-    <message>
-        <source>Password Generator</source>
-        <translation>Jelszógenerátor</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Speciális</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>&amp;Hozzáférés mindenkori engedélyezése a bejegyzésekhez</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Bejegyzések &amp;frissítésének mindenkori engedélyezése</translation>
-    </message>
-    <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>Csak a kijelölt adatbázishoz kell kapcsolódnia egy klienssel.</translation>
-    </message>
-    <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>&amp;Keresés minden megnyitott adatbázis bejegyzéseiben</translation>
-    </message>
-    <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>A karakterlánc mezők automatikus létrehozása vagy frissítése nem támogatott.</translation>
-    </message>
-    <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>A „KPH:”-val kezdődő fejlett karakterlánc mezők &amp;visszaadása</translation>
-    </message>
-    <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP port:</translation>
+        <source>Enter password:</source>
+        <translation>Jelszó megadása:</translation>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Alapértelmezett port: 19455</translation>
+        <source>Confirm password:</source>
+        <translation>Jelszó megerősítése:</translation>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>A KeePassXC ezen a porton fog figyelni: 127.0.0.1</translation>
+        <source>Password</source>
+        <translation>Jelszó</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;Figyelmeztetés:&lt;/b&gt; A következő beállítások veszélyesek lehetnek!</translation>
+        <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;A jelszó az adatbázis biztonságban tartásának elsődleges módja.&lt;/p&gt;&lt;p&gt;A jó jelszavak hosszúak és egyediek. A KeePassXC elő tud állítani egyet Önnek.&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;A KeePassHTTP támogatása hamarosan lejár és a jövőben eltávolításra kerül. &lt;br&gt;Javasolt váltani a KeePassXC-Browser kiegészítőre! A költözéshez hasznos lehet a &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;költözési útmutató.&lt;/a&gt;</translation>
+        <source>Password cannot be empty.</source>
+        <translation>A jelszó nem lehet üres.</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Nem lehet privilegizált portokhoz kötődni</translation>
+        <source>Passwords do not match.</source>
+        <translation>A jelszavak nem egyeznek</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Nem lehet az 1024 alatti, privilegizált portokhoz kötődni!
-Az alapértelmezett 19455 port lesz használva.</translation>
+        <source>Generate master password</source>
+        <translation>Mesterjelszó előállítása</translation>
     </message>
 </context>
 <context>
@@ -3157,18 +3917,10 @@ Az alapértelmezett 19455 port lesz használva.</translation>
         <translation>Szólista:</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Szavak száma:</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>Szóelválasztó:</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>Előállítás</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Másolás</translation>
     </message>
@@ -3181,10 +3933,6 @@ Az alapértelmezett 19455 port lesz használva.</translation>
         <translation>Bezárás</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>Alkalmaz</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>Entrópia: %1 bit</translation>
     </message>
@@ -3212,6 +3960,171 @@ Az alapértelmezett 19455 port lesz használva.</translation>
         <comment>Password quality</comment>
         <translation>Kiváló</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation>Bővített ASCII</translation>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation>Váltás speciális módba</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Speciális</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation>Nagybetűk A-tól F-ig</translation>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation>Kisbetűk a-tól f-ig</translation>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation>Zárójelek</translation>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation>{[(</translation>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation>Központozás</translation>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation>.,:;</translation>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation>Idézőjelek</translation>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation>&quot; &apos;</translation>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation>Matematika</translation>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation>&lt;*+!?=</translation>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation>Kötőjelek</translation>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation>\_|-/</translation>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation>Logogramok</translation>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation>#$%&amp;&amp;@^`~</translation>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation>Váltás egyszerű módba</translation>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation>Egyszerű</translation>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation>A jelszó előállításnál kihagyandó karakterkészletek</translation>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation>Ne tartalmazza:</translation>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation>A nem hexadecimális betűk hozzáadása a „ne tartalmazza” listához</translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation>Hexadecimális</translation>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation>Kihagyott karakterek: „0”, „1”, „l”, „I”, „O”, „|”, „﹒”</translation>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation>Szavak szá&amp;ma:</translation>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation>Újra előállítás</translation>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Törlés</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Eltávolítás</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Letiltás</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3232,34 +4145,18 @@ Az alapértelmezett 19455 port lesz használva.</translation>
         <translation>Nem lehet visszafejteni az üzenetet</translation>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
-        <translation>Időtúllépés vagy nem lehet csatlakozni a KeePassXC-hez</translation>
-    </message>
-    <message>
         <source>Action cancelled or denied</source>
         <translation>A műveletet megszakították vagy visszautasították</translation>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation>Nem lehet titkosítani az üzenetet vagy a nyilvános kulcs nem található. A natív üzenetküldés engedélyezve van a KeePassXC-ben?</translation>
-    </message>
-    <message>
         <source>KeePassXC association failed, try again</source>
         <translation>A KeePassXC társítása sikertelen, próbálja újra</translation>
     </message>
     <message>
-        <source>Key change was not successful</source>
-        <translation>A kulcsmódosítás nem volt sikeres</translation>
-    </message>
-    <message>
         <source>Encryption key is not recognized</source>
         <translation>A titkosítási kulcs nem lett felismerve</translation>
     </message>
     <message>
-        <source>No saved databases found</source>
-        <translation>Nincs található mentett adatbázis</translation>
-    </message>
-    <message>
         <source>Incorrect action</source>
         <translation>Helytelen művelet</translation>
     </message>
@@ -3385,10 +4282,6 @@ Az alapértelmezett 19455 port lesz használva.</translation>
         <translation>Jelszó beszúrása a feloldásához: %1</translation>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation>%1 kulcsfájl betöltése sikertelen: %2</translation>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3472,12 +4365,6 @@ Elérhető parancsok:
         <translation>hiba az eszköz olvasása közben</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>a fájl üres!
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation>rosszul formázott karakterlánc</translation>
     </message>
@@ -3486,30 +4373,6 @@ Elérhető parancsok:
         <translation>hiányzó lezáró idézőjel</translation>
     </message>
     <message>
-        <source>AES: 256-bit</source>
-        <translation>AES: 256 bites</translation>
-    </message>
-    <message>
-        <source>Twofish: 256-bit</source>
-        <translation>Twofish: 256 bites</translation>
-    </message>
-    <message>
-        <source>ChaCha20: 256-bit</source>
-        <translation>ChaCha20: 256 bites</translation>
-    </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – ajánlott)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 4)</source>
-        <translation>AES-KDF (KDBX 4)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 3.1)</source>
-        <translation>AES-KDF (KDBX 3.1)</translation>
-    </message>
-    <message>
         <source>Group</source>
         <translation>Csoport</translation>
     </message>
@@ -3538,10 +4401,6 @@ Elérhető parancsok:
         <translation>Létrehozva</translation>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
-        <translation>Hagyományos böngészőintegráció</translation>
-    </message>
-    <message>
         <source>Browser Integration</source>
         <translation>Böngészőintegráció</translation>
     </message>
@@ -3570,10 +4429,6 @@ Elérhető parancsok:
         <translation>Szavak számra a diceware jelmondat számára.</translation>
     </message>
     <message>
-        <source>count</source>
-        <translation>szám</translation>
-    </message>
-    <message>
         <source>Wordlist for the diceware generator.
 [Default: EFF English]</source>
         <translation>Szólista a diceware előállító számára.
@@ -3584,28 +4439,441 @@ Elérhető parancsok:
         <translation>Véletlenszerű új jelmondat előállítása.</translation>
     </message>
     <message>
-        <source>Length of the generated password.</source>
-        <translation>Előállított jelszó hossza.</translation>
+        <source>Invalid value for password length %1.</source>
+        <translation>Érvénytelen jelszóhossz érték: %1.</translation>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation>Nem hozható létre bejegyzés a(z) %1 útvonallal.</translation>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation>Adja meg a jelszót az új bejegyzéshez:</translation>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation>Az adatbázis kiírása sikertelen: %1.</translation>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
-        <translation>Kisbetűk alkalmazása az előállított jelszóban.</translation>
+        <source>Successfully added entry %1.</source>
+        <translation>A(z) %1 bejegyzés sikeresen hozzáadva.</translation>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
-        <translation>Nagybetűk alkalmazása az előállított jelszóban.</translation>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation>A jelenlegi TOTP másolása a vágólapra.</translation>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
-        <translation>Számok alkalmazása az előállított jelszóban.</translation>
+        <source>Invalid timeout value %1.</source>
+        <translation>Érvénytelen időtúllépési érték: %1.</translation>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
-        <translation>Speciális karakterek alkalmazása az előállított jelszóban.</translation>
+        <source>Entry %1 not found.</source>
+        <translation>A(z) %1 bejegyzés nem található.</translation>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
-        <translation>Kiterjesztett ASCII karakterek alkalmazása az előállított jelszóban.</translation>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation>A(z) %1 útvonalú bejegyzéshez nincs TOTP beállítva.</translation>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation>A bejegyzés jelenlegi TOTP értéke a vágólapra másolva!</translation>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation>A bejegyzés jelszava a vágólapra másolva!</translation>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation><numerusform>A vágólap törlése %1 másodperc múlva…</numerusform><numerusform>A vágólap törlése %1 másodperc múlva…</numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation>Vágólap törölve!</translation>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation>Jelszó bekérés és egyéb másodlagos kimenetek némítása.</translation>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation>szám</translation>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation>Érvénytelen jelszóhossz érték: %1</translation>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation>Nem található bejegyzés a(z) %1 útvonalon.</translation>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation>A(z) %1 bejegyzés egyik mezője sem lesz változtatva.</translation>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation>Adja meg a bejegyzés új jelszavát:</translation>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation>Az adatbázis kiírása sikertelen: %1</translation>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation>A(z) %1 bejegyzése sikeresen szerkesztve.</translation>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation>Hossz: %1</translation>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation>Entrópia: %1</translation>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation>Log10: %1</translation>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation>Több szavas extra bitek: %1</translation>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation>Típus: Nyers erő</translation>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation>Típus: Szótár</translation>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation>Típus: Szótár+leet</translation>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation>Típus: Felhasználói szavak</translation>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation>Típus: Felhasználói+leet</translation>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation>Típus: Ismételt</translation>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation>Típus: Sorozat</translation>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation>Típus: Térbeli</translation>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation>Típus: Dátum</translation>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation>Típus: Nyers erő (Ism.)</translation>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation>Típus: Szótár (Ism.)</translation>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation>Típus: Szótár+leet (Ism.)</translation>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation>Típus: Felhasználói szavak (Ism.)</translation>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation>Típus: Felhasználói+leet (Ism.)</translation>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation>Típus: Ismételt (Ism.)</translation>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation>Típus: Sorozat (Ism.)</translation>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation>Típus: Térbeli (Ism.)</translation>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation>Típus: Dátum (Ism.)</translation>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation>Típus: Ismeretlen%1</translation>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation>Entrópia: %1 (%2)</translation>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation>*** Jelszóhossz (%1) != részek hosszának össszege (%2) ***</translation>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation>A(z) %1 kulcsfájl betöltése sikertelen: %2</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>A(z) %1 fájl nem létezik</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>A(z) %1 fájl nem nyitható meg</translation>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation>Hiba az adatbázis olvasásakor:
+%1</translation>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation>Hiba az adatbázis feldolgozásakor:
+%1</translation>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation>Az előállított jelszó hossza</translation>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation>Kisbetűs karakterek használata</translation>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation>Nagybetűs karakterek használata</translation>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation>Számok használata.</translation>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation>Különleges karakterek használata</translation>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation>Bővített ASCII használata</translation>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation>Karakterkészlet kizárása</translation>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation>karakter</translation>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation>Hasonlóan kinéző karakterek kizárása</translation>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation>Karakterek választása minden egyes csoportból</translation>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation>A csoport elemeinek rekurzív listázása.</translation>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation>A(z) %1 csoport nem található.</translation>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation>Hiba az összeolvasztási fájl olvasásakor:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation>Az adatbázis nem menthető fájlba: %1</translation>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation>Az adatbázis nem menthető fájlba: %1</translation>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation>A(z) %1 bejegyzés sikeresen kukába dobva.</translation>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation>A(z) %1 bejegyzés sikeresen törölve.</translation>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation>A bejegyzés jelenlegi TOTP értékének megjelenítése.</translation>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation>HIBA: ismeretlen %1 attribútum.</translation>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation>Nincs program megadva a vágólapkezeléshez</translation>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation>A(z) %1 program nem indítható el</translation>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation>a fájl üres</translation>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation>%1: (sor, oszlop) %2,%3</translation>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256 bites</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256 bites</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256 bites</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – ajánlott)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation>Érvénytelen beállítások</translation>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation>Érvénytelen kulcs</translation>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>Egy bejegyzés eltávolítása az adatbázisból.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>Az eltávolítandó bejegyzés útvonala.</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>A meglévő egypéldányos zárolási fájl érvénytelen. Új példány indítása.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>A zárolási fájlt nem lehet létrehozni. Egyedi példány mód letiltva.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC – keresztplatformos jelszókezelő</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>megnyitandó jelszóadatbázisok fájlnevei (*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>útvonal az egyéni beállítófájlhoz</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>adatbázis kulcsfájlja</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>adatbázis jelszó beolvasása az stdin-ről</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation>Szülőablak kezelése</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>A KeePassXC egy másik példánya is fut.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Végzetes hiba a kriptográfiai funkciók tesztelése közben.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC – Hiba</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation>Adatbázis jelszava</translation>
     </message>
 </context>
 <context>
@@ -3643,12 +4911,98 @@ Elérhető parancsok:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
     <message>
-        <source>Search...</source>
-        <translation>Keresés…</translation>
+        <source>Agent connection failed.</source>
+        <translation>Ügynökkapcsolódás sikertelen.</translation>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation>Ügynök protokoll hiba.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation>Nincs működő ügynök, nem adható hozzá identitás.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation>Nincs működő ügynök, nem távolítható el identitás.</translation>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation>Az ügynök visszautasította ezt az identitást. Lehetséges okok:</translation>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation>A kulcs már hozzá lett adva.</translation>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation>Az ügynök nem támogatja a korlátozott élettartamot (lásd a lehetőségek).</translation>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation>Az ügynök nem támogatja a visszaigazolási kérelmet (lásd a lehetőségeket).</translation>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation>Keresés a súgóban</translation>
     </message>
     <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation>A keresési kifejezések a következőek: [módosítók][mező:][&quot;]kifejezés[&quot;]</translation>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation>Az összes kifejezéssel egyeznie kell (azaz logikai ÉS)</translation>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation>Módosítók</translation>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation>kifejezés kihagyása a találatok közül</translation>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation>pontos egyezés minden kifejezésre</translation>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation>regex használata a kifejezésben</translation>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation>Mezők</translation>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation>Kifejezés helyettesítő karakterei</translation>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation>illeszkedés bármire</translation>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation>illeszkedés egyre</translation>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation>logikai VAGY</translation>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation>Példák</translation>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
         <source>Search</source>
         <translation>Keresés</translation>
     </message>
@@ -3657,313 +5011,316 @@ Elérhető parancsok:
         <translation>Törlés</translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Nagy- és kisbetű érzékeny</translation>
-    </message>
-    <message>
         <source>Limit search to selected group</source>
         <translation>Keresés korlátozása a kijelölt csoportra</translation>
     </message>
+    <message>
+        <source>Search Help</source>
+        <translation>Keresés a súgóban</translation>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation>Keresés (%1)…</translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation>Nagy- és kisbetű érzékeny</translation>
+    </message>
 </context>
 <context>
-    <name>Service</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC: Új kulcstársítási kérés</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation>A fenti kulcsra társítási kérelem érkezett.
-A KeePassXC adatbázishoz való hozzáférés engedélyezéséhez egy egyedi név hozzárendelése és elfogadása szükséges.</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: Felülírja a létező kulcsot?</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Létezik már egy megosztott titkosítási kulcs ezzel a névvel: „%1”.
-Valóban felülírja?</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: Bejegyzés frissítése</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Frissíti az információt ebben: %1 – %2?</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Adatbázis zárolva!</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Az aktív adatbázis zárolt.
-Fel kell oldani a kijelölt adatbázist, vagy egy másik nem zároltat kell választania.</translation>
+        <source>Key:</source>
+        <translation>Kulcs:</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Kulcsok eltávolítva az adatbázisból</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation><numerusform>Sikeresen eltávolításra került %n titkosítási kulcs a KeePassX/HTTP beállításokból.</numerusform><numerusform>Sikeresen eltávolításra került %n titkosítási kulcs a KeePassX/HTTP beállításokból.</numerusform></translation>
+        <source>Generate</source>
+        <translation>Előállítás</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Nincs találat a kulcsok között</translation>
+        <source>Import</source>
+        <translation>Importálás</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>Nem található megosztott titkosítási kulcs a KeePassHTTP beállításokban.</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Nincs ilyen beállítás!</translation>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>Az aktív adatbázisban nincs egyetlen KeePassHTTP beállítási bejegyzés sem.</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>Tárolt jogosultságok törlése…</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>Megszakítás</translation>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Jogosultságok eltávolítva</translation>
+        <source>Remove</source>
+        <translation>Eltávolítás</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation><numerusform>Sikeresen el lett távolítva a jogosultság %n elemről.</numerusform><numerusform>Sikeresen el lett távolítva a jogosultság %n elemről.</numerusform></translation>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Nem található bejegyzés ilyen jogosultsággal!</translation>
+        <source>Status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Az aktív adatbázisban nincs egyetlen jogosultsági bejegyzés sem.</translation>
+        <source>Fingerprint</source>
+        <translation>Ujjlenyomat</translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
-        <translation>Alkalmazásbeállítások</translation>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Általános</translation>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>Biztonság</translation>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>Hozzáférési hiba a beállítási fájlhoz: %1</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>Alapvető beállítások</translation>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>A KeePassXC többszörös indításának tiltása</translation>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>Utolsó adatbázis megjegyzése</translation>
+        <source>All files</source>
+        <translation>Minden fájl</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Az utolsó kulcsfájlok és biztonsági hardverkulcsok megjegyzése</translation>
+        <source>Select path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Előző adatbázisok betöltése indításkor</translation>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>Automatikus mentés kilépéskor</translation>
+        <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"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>Automatikus mentés minden módosítás után</translation>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Külső módosításkor az adatbázis automatikus újratöltése</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>Kicsinyítés a vágólapra történő másoláskor</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Indításkor az ablak kicsinyítése</translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>A csoport ikonjának használata a bejegyzés létrehozásakor</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Nem adatjellegű változások (pl. csoport lenyitása) esetén az adatbázis módosított állapotba kerülésének megakadályozása</translation>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
-        <translation>Részletek nézet elrejtése</translation>
+        <source>Never</source>
+        <translation>Soha</translation>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>Rendszertálca-ikon megjelenítése</translation>
+        <source>Always</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>Az ablak rendszertálcára rejtése kicsinyítéskor</translation>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
-        <translation>Kilépés helyett rendszertálcára való rejtés</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
-        <translation>Sötét rendszertálca-ikon</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Nyelv</translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Automatikus beírás</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>Bejegyzések címének alkalmazása az ablakok illesztésénél a globális automatikus beírás számára. </translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>Bejegyzések URL-jének alkalmazása az ablakok illesztésénél a globális automatikus beírás számára. </translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation>Mindig kérdezzen az automatikus beírás megkezdése előtt</translation>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Globális automatikus beírás gyorsbillentyűje</translation>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>Automatikus beírás késleltetése</translation>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation>ms</translation>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
-        <translation>Indítás</translation>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
-        <translation>Fájlkezelés</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation>Adatbázisok biztonságos mentése (lehet, hogy inkompatibilis a Dropbox-szal és hasonlókkal)</translation>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
-        <translation>Készüljön biztonsági mentés az adatbázisról mentés előtt</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
-        <translation>Bejegyzéskezelés</translation>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Általános</translation>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
-        <translation>Időtúllépések</translation>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>Vágólap törlése ennyi idő után</translation>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> mp</translation>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>Adatbázis zárolása ennyi inaktivitás után</translation>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Kényelem</translation>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Adatbázis zárolása munkamenet zárolásakor vagy a fedél lecsukásakor</translation>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>Adatbázis zárolása az ablak lekicsinyítésekor</translation>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>TotpDialog</name>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>Jelszóismétlés elkerülése látható jelszó esetén</translation>
+        <source>Timed Password</source>
+        <translation>Időalapú jelszó</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Jelszavak megjelenítése alapértelmezetten egyszerű szövegként</translation>
+        <source>000000</source>
+        <translation>000000</translation>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
-        <translation>Jelszavak elrejtése az előnézet panelen</translation>
+        <source>Copy</source>
+        <translation>Másolás</translation>
+    </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation><numerusform>&lt;b&gt;%n&lt;/b&gt; másodperc múlva lejár</numerusform><numerusform>&lt;b&gt;%n&lt;/b&gt; másodperc múlva lejár</numerusform></translation>
     </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
     <message>
-        <source>Hide entry notes by default</source>
-        <translation>Bejegyzések jegyzeteinek elrejtése alapértelmezetten</translation>
+        <source>Copy</source>
+        <translation>Másolás</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>Adatvédelem</translation>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation>MEGJEGYZÉS: Ezek a TOTP beállítások egyéniek, és lehet hogy más hitelesítőkkel nem működnek.</translation>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>A Google használata tartalékként, a webhelyikonok letöltésére</translation>
+        <source>There was an error creating the QR code.</source>
+        <translation>Hiba történt a QR-kód létrehozásakor</translation>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
-        <translation>Az előzőleg zárolt adatbázis újbóli zárolása automatikus beírást követően</translation>
+        <source>Closing in %1 seconds.</source>
+        <translation>Bezárás %1 másodperc után.</translation>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation>TOTP beállítása</translation>
@@ -3985,59 +5342,84 @@ Fel kell oldani a kijelölt adatbázist, vagy egy másik nem zároltat kell vál
         <translation>Egyéni beállítások alkalmazása</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>Megjegyzés: Ezeket a beállításokat csak a hatásuk pontos ismeretében érdemes megváltoztatni.</translation>
+        <source>Custom Settings</source>
+        <translation>Egyéni beállítások</translation>
     </message>
     <message>
         <source>Time step:</source>
         <translation>Időléptetés:</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8-számjegyű</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> mp</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>Kódméret:</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6-számjegyű</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>Kódméret:</translation>
+        <source>7 digits</source>
+        <translation>7-számjegyű</translation>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> mp</translation>
+        <source>8 digits</source>
+        <translation>8-számjegyű</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>Időalapú jelszó</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Másolás</translation>
+        <source>Close</source>
+        <translation>Bezárás</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>Lejárat:</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>mp</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>Adatbázis feloldása</translation>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4072,42 +5454,26 @@ Fel kell oldani a kijelölt adatbázist, vagy egy másik nem zároltat kell vál
     </message>
 </context>
 <context>
-    <name>main</name>
-    <message>
-        <source>Remove an entry from the database.</source>
-        <translation>Egy bejegyzés eltávolítása az adatbázisból.</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>Adatbázis útvonala.</translation>
-    </message>
-    <message>
-        <source>Path of the entry to remove.</source>
-        <translation>Az eltávolítandó bejegyzés útvonala.</translation>
-    </message>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC – keresztplatformos jelszókezelő</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>megnyitandó jelszóadatbázisok fájlnevei (*.kdbx)</translation>
+        <source>Refresh</source>
+        <translation>Frissítés</translation>
     </message>
     <message>
-        <source>path to a custom config file</source>
-        <translation>útvonal az egyéni beállítófájlhoz</translation>
+        <source>YubiKey Challenge-Response</source>
+        <translation>YubiKey kihívás-válasz</translation>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>adatbázis kulcsfájlja</translation>
+        <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>&lt;p&gt;Ha van &lt;a href=&quot;https://www.yubico.com/&quot;&gt;YubiKey&lt;/a&gt; eszköze, akkor használhatja a további biztonság érdekében.&lt;/p&gt;&lt;p&gt;A YubiKey-hez szükséges, hogy az egyik foglalata &lt;a href=&quot;https://www.yubico.com/products/services-software/personalization-tools/challenge-response/&quot;&gt;HMAC-SHA1 kihívás-válaszként&lt;/a&gt; legyen beállítva.&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>adatbázis jelszó beolvasása az stdin-ről</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation>Nincs YubiKey észlelve, győződjön meg róla, hogy be van-e dugva.</translation>
     </message>
     <message>
-        <source>Parent window handle</source>
-        <translation>Szülőablak kezelése</translation>
+        <source>No YubiKey inserted.</source>
+        <translation>Nincs YubiKey behelyezve.</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_id.ts b/share/translations/keepassx_id.ts
index 74dd6523c..f56ecabb7 100644
--- a/share/translations/keepassx_id.ts
+++ b/share/translations/keepassx_id.ts
@@ -38,12 +38,6 @@
         <translation>Salin ke papan klip</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>Versi %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>Revisi: %1</translation>
     </message>
@@ -76,34 +70,48 @@ Kernel: %3 %4</translation>
         <translation>Terima kasih dari tim KeePassXC kepada debfx yang telah membuat KeepassX original.</translation>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
-        <translation type="unfinished"/>
+        <source>Version %1</source>
+        <translation>Versi %1</translation>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>Konfirmasi Akses KeePassXC HTTP</translation>
+        <source>Build Type: %1</source>
+        <translation>Tipe Build: %1</translation>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>Ingat tindakan ini</translation>
+        <source>Auto-Type</source>
+        <translation>Ketik-Otomatis</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Izinkan</translation>
+        <source>Browser Integration</source>
+        <translation>Integrasi Peramban</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>Tolak</translation>
+        <source>SSH Agent</source>
+        <translation>SSH Agent</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>%1 telah meminta akses sandi untuk item berikut.
-Silakan pilih apakah Anda ingin mengizinkannya.</translation>
+        <source>YubiKey</source>
+        <translation>YubiKey</translation>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation>TouchID</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Nihil</translation>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -112,6 +120,277 @@ Silakan pilih apakah Anda ingin mengizinkannya.</translation>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>Aktifkan SSH Agent (butuh memulai ulang)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Pengaturan Aplikasi</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Umum</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Keamanan</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Galat akses untuk berkas konfigurasi %1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Pengaturan Dasar</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>Memulai</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Hanya mulai satu aplikasi KeePassXC</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Ingat basis data terakhir</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Ingat berkas kunci dan dongle keamanan terakhir</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Muat basis data sebelumnya saat mulai</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>Minimalkan jendela saat memulai aplikasi</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>Manajemen Berkas</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation>Secara aman menyimpan berkas basis data (mungkin tidak kompatibel dengan Dropbox, dll)</translation>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation>Cadangkan basis data sebelum disimpan</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Otomatis simpan setelah setiap perubahan</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Otomatis simpan ketika keluar</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Jangan tandai basis data telah diubah untuk perubahan non-data (mis. melebarkan grup)</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Muat ulang basis data secara otomatis ketika diubah secara eksternal</translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>Manajemen Entri</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>Gunakan ikon grup pada pembuatan entri</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Minimalkan ketika menyalin ke papan klip</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation>Sembunyikan panel pratinjau entri</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Umum</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation>Sembunyikan bilah perkakas (ikon)</translation>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Tampilkan ikon baki sistem</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>Ikon baki sistem gelap</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Sembunyikan jendela ke baki sistem ketika diminimalkan</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Bahasa</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Ketik-Otomatis</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>Gunakan judul entri untuk mencocokkan jendela untuk Ketik-Otomatis global</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>Gunakan URL entri untuk mencocokkan jendela untuk Ketik-Otomatis global</translation>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>Selalu bertanya sebelum menjalankan Ketik-Otomatis</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Pintasan global Ketik-Otomatis</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation>md</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>Waktu Kedaluwarsa</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>Kosongkan papan klip setelah</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>det</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>Kunci basis data setelah tidak aktif selama</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation> min</translation>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>Kenyamanan</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Kunci basis data ketika sesi dikunci atau lid ditutup</translation>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>Kunci basis data setelah meminimalkan jendela</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation>Kunci ulang basis data yang sebelumnya terkunci setelah menjalankan Ketik-Otomatis</translation>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>Tidak membutuhkan pengulangan sandi ketika ruas bisa dilihat</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation>Jangan sembunyikan sandi saat penyuntingan</translation>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation>Jangan gunakan placeholder untuk ruas sandi yang kosong</translation>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation>Sembunyikan sandi di panel pratinjau entri</translation>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>Sembunyikan catatan secara bawaan</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>Privasi</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation>Gunakan DuckDuckGo sebagai cadangan untuk mengunduh ikon website</translation>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -215,6 +494,26 @@ Silakan pilih apakah Anda ingin mengizinkannya.</translation>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Batal</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -288,14 +587,6 @@ Silakan pilih apakah Anda ingin mengizinkannya.</translation>
         <translation>Urutkan kredensial yang cocok berdasarkan &amp;nama pengguna</translation>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>&amp;Putuskan koneksi semua peramban</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>&amp;Lupakan semua perizinan yang diingat</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>Tingkat Lanjut</translation>
     </message>
@@ -361,14 +652,6 @@ Silakan pilih apakah Anda ingin mengizinkannya.</translation>
         <translation>&lt;b&gt;Peringatan:&lt;/b&gt; Opsi berikut bisa berbahaya!</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>Berkas Executable (*.exe);;Semua Berkas (*.*)</translation>
-    </message>
-    <message>
-        <source>Executable Files (*)</source>
-        <translation>Berkas Executable (*)</translation>
-    </message>
-    <message>
         <source>Select custom proxy location</source>
         <translation>Pilih lokasi proksi khusus</translation>
     </message>
@@ -376,6 +659,31 @@ Silakan pilih apakah Anda ingin mengizinkannya.</translation>
         <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
         <translation>Maaf, KeePassXC-Browser saat ini tidak mendukung rilisan Snap.</translation>
     </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation>Membutuhkan KeePassXC-Browser agar integrasi peramban bisa bekerja. &lt;br /&gt;Unduh di %1 dan %2.</translation>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation>Peramban &amp;Tor</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: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation>Semua Berkas</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"/>
+    </message>
 </context>
 <context>
     <name>BrowserService</name>
@@ -416,153 +724,43 @@ Apakah Anda ingin menimpanya ulang?</translation>
         <translation>Apakah Anda ingin memperbarui informasi dalam %1 - %2?</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Basis data dikunci!</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Basis data aktif dikunci!
-Silakan buka kunci atau pilih yang lainnya yang tidak terkunci.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Pengaturan tidak tersedia!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation>Basis data yang aktif tidak berisi entri pengaturan.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Tidak ada kunci yang ditemukan</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation>Tidak ditemukan kunci enkripsi bersama di dalam pengaturan KeePassXC.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Buang kunci dari basis data</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation><numerusform>Berhasil membuang %n kunci enkripsi dari pengaturan KeePassXC.</numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>Membuang perizinan yang disimpan...</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>Batal</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Buang izin</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation><numerusform>Berhasil membuang perizinan dari %n entri.</numerusform></translation>
+        <source>Converting attributes to custom data…</source>
+        <translation>Mengkonversi atribut ke data khusus...</translation>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Tidak entri dengan izin yang ditemukan!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Basis data aktif tidak berisi entri dengan izin.</translation>
-    </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>Sandi</translation>
-    </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>Masukkan sandi:</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>Ulangi sandi:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>Berkas &amp;kunci</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>Telusuri</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Buat</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Refresh</source>
-        <translation>Segarkan</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>Berkas kunci</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>Semua Berkas</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>Buat Berkas Kunci...</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>Tidak bisa membuat Berkas Kunci :</translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>Pilih berkas kunci</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Sandi kosong</translation>
-    </message>
-    <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>Apakah Anda benar-benar ingin menggunakan lema kosong sebagai sandi?</translation>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>Sandi berbeda.</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>Gagal menetapkan %1 sebagai berkas Kunci:
-%2</translation>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Legacy key file format</source>
-        <translation>Format berkas kunci legacy</translation>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation type="unfinished"/>
     </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>Anda menggunakan format berkas kunci legacy yang
-tidak akan lagi didukung di masa depan.
-
-Harap pertimbangkan membuat berkas kunci baru.</translation>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>Gagal mengubah kunci master: tidak ada YubiKey yang disematkan.</translation>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -643,14 +841,6 @@ Harap pertimbangkan membuat berkas kunci baru.</translation>
         <translation>Tidak ada di dalam berkas CSV</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>Nama ruas kosong</translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>kolom</translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>Diimpor dari berkas CSV</translation>
     </message>
@@ -659,48 +849,84 @@ Harap pertimbangkan membuat berkas kunci baru.</translation>
         <translation>Data original:</translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>Terdapat galat di dalam berkas CSV !</translation>
+        <source>Error</source>
+        <translation>Galat</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation> pesan dilewati]</translation>
+        <source>Empty fieldname %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Galat</translation>
+        <source>column %1</source>
+        <translation>kolom %1</translation>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>Impor CSV: galat penulis:
-</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>Galat</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Tidak bisa mengkalkulasi kunci utama</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
-        <translation><numerusform>%n byte, </numerusform></translation>
+        <source>%n column(s)</source>
+        <translation><numerusform>%n kolom</numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
-        <translation><numerusform>%n baris, </numerusform></translation>
+        <source>%n byte(s)</source>
+        <translation><numerusform>%n byte</numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
-        <translation><numerusform>%n kolom</numerusform></translation>
+        <source>%n row(s)</source>
+        <translation><numerusform>%n baris</numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Root</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>Berkas %1 tidak ada.</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Tidak bisa membuka berkas %1.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation>Terjadi kesalahan saat membaca basis data: %1</translation>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation>Buka Kunci Basis Data - KeePassXC</translation>
     </message>
 </context>
 <context>
@@ -730,14 +956,6 @@ Harap pertimbangkan membuat berkas kunci baru.</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Tidak bisa membuka basis data.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Tidak bisa membuka berkas kunci</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation>Format berkas kunci legacy</translation>
     </message>
@@ -767,101 +985,170 @@ Harap pertimbangkan membuat berkas kunci baru.</translation>
         <source>Select key file</source>
         <translation>Pilih berkas kunci</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>Perbaiki basis data</translation>
+        <source>TouchID for quick unlock</source>
+        <translation>TouchID untuk membuka kunci cepat</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Galat</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation>Tidak bisa membuka basis data:
+%1</translation>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Tidak bisa membuka berkas kunci</translation>
+        <source>Can't open key file:
+%1</source>
+        <translation>Tidak bisa membuka berkas kunci:
+%1</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Tidak bisa membuka basis data.</translation>
+        <source>Passwords</source>
+        <translation>Sandi</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Basis data terbuka dengan baik. Tidak perlu melakukan apa-apa.</translation>
+        <source>Advanced Settings</source>
+        <translation>Pengaturan Lanjutan</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>Sukses</translation>
+        <source>General</source>
+        <translation>Umum</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Keamanan</translation>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>Basis data berhasil diperbaiki
-Anda bisa menyimpannya sekarang.</translation>
+        <source>Master Key</source>
+        <translation>Kunci Master</translation>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>Tidak bisa memperbaiki basis data.</translation>
+        <source>Encryption Settings</source>
+        <translation>Pengaturan Enkripsi</translation>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation>Integrasi Peramban</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>Umum</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation>Pengaturan KeePassXC-Browser</translation>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>Enkripsi</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>&amp;Putuskan koneksi semua peramban</translation>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
+        <source>Forg&amp;et all site-specific settings on entries</source>
         <translation type="unfinished"/>
     </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>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Understood, keep number</source>
-        <translation>Mengerti, tetap simpan</translation>
+        <source>Stored keys</source>
+        <translation>Kunci tersimpan</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>Batal</translation>
+        <source>Remove</source>
+        <translation>Buang</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
+        <source>Delete the selected key?</source>
+        <translation>Hapus kunci yang dipilih?</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
         <translation type="unfinished"/>
     </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>
+        <source>Key</source>
+        <translation>Kunci</translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation>Nilai</translation>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation>Aktifkan Integrasi Peramban untuk mengakses pengaturan ini.</translation>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation>Putuskan koneksi semua peramban</translation>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KDF unchanged</source>
-        <translation>KDF tidak berubah</translation>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Tidak ada kunci yang ditemukan</translation>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
-        <translation>Gagal mentransformasi kunci menggunakan parameter KDF baru; KDF tidak berubah.</translation>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Buang kunci dari basis data</translation>
     </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
-        <translation><numerusform> MiB</numerusform></translation>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation><numerusform>Berhasil membuang %n kunci enkripsi dari pengaturan KeePassXC.</numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Membuang perizinan yang disimpan...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Batal</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Buang izin</translation>
     </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
-        <translation type="unfinished"><numerusform></numerusform></translation>
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation><numerusform>Berhasil membuang perizinan dari %n entri.</numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: Tidak entri dengan izin yang ditemukan!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Basis data aktif tidak berisi entri dengan izin.</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation>Pindahkan atribut KeePassHTTP ke data khusus</translation>
+    </message>
+    <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 type="unfinished"/>
     </message>
 </context>
 <context>
@@ -898,6 +1185,109 @@ If you keep this number, your database may be too easy to crack!</source>
         <source>Parallelism:</source>
         <translation>Paralelisme:</translation>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation>Waktu Dekripsi:</translation>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation>?? d</translation>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation>Ubah</translation>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation>100 md</translation>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation>5 d</translation>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation>Format basis data:</translation>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation>Hal ini penting jika Anda ingin menggunakan basis data menggunakan program lain.</translation>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation>KDBX 4.0 (direkomendasikan)</translation>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation>KDBX 3.1</translation>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation>tidak berubah</translation>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation>Mengerti, tetap simpan</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Batal</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation>KDF tidak berubah</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation>Gagal mentransformasi kunci menggunakan parameter KDF baru; KDF tidak berubah.</translation>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation><numerusform> MiB</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation><numerusform>%1 md</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation><numerusform>%1 d</numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -947,91 +1337,110 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>Root</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Basis Data KeePass 2</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Semua Berkas</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Buka basis data</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>Berkas tidak ditemukan!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Tidak bisa membuka basis data.</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>Berkas terbuka dalam mode baca-saja.</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>Buka berkas CSV</translation>
+        <source>Add additional protection...</source>
+        <translation>Tambah proteksi tambahan...</translation>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>Berkas CSV</translation>
+        <source>No encryption key added</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>Semua berkas (*)</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Gabung basis data</translation>
+        <source>No password set</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Buka basis data KeePass 1</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 type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>Basis data KeePass 1</translation>
+        <source>Unknown error</source>
+        <translation>Galat tidak diketahui</translation>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>Tutup?</translation>
+        <source>Failed to change master key</source>
+        <translation>Gagal mengubah kunci master</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; dalam mode penyuntingan.
-Tetap buang ubahan dan tutup?</translation>
+        <source>Database Name:</source>
+        <translation>Nama Basis Data:</translation>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>Simpan perubahan?</translation>
+        <source>Description:</source>
+        <translation>Deskripsi:</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>&quot;%1&quot; telah dimodifikasi.
-Simpan perubahan?</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Basis Data KeePass 2</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Gagal menyimpan basis data.</translation>
+        <source>All files</source>
+        <translation>Semua Berkas</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Sandi</translation>
+        <source>Open database</source>
+        <translation>Buka basis data</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Simpan basis data sebagai</translation>
+        <source>CSV file</source>
+        <translation>Berkas CSV</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>Gabung basis data</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Buka basis data KeePass 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>Basis data KeePass 1</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1042,40 +1451,40 @@ Simpan perubahan?</translation>
         <translation>Gagal membuat berkas CSV.</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>Basis data baru</translation>
+        <source>Database creation error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>locked</source>
-        <translation>terkunci</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 type="unfinished"/>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>Kunci basis data</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>Tidak bisa mengunci basis data karena Anda sedang menyuntingnya.
-Harap tekan batal untuk menyelesaikan ubahan Anda atau membuangnya.</translation>
+        <source>Select CSV file</source>
+        <translation>Pilih berkas CSV</translation>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>Basis data ini telah dimodifikasi.
-Apakah Anda ingin menyimpan basis data sebelum menguncinya?
-Kalau tidak, ubahan Anda akan hilang.</translation>
+        <source>New Database</source>
+        <translation>Basis Data Baru</translation>
     </message>
     <message>
-        <source>Disable safe saves?</source>
-        <translation>Nonaktifkan penyimpanan aman?</translation>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Basis Data Baru]</translation>
     </message>
     <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 telah beberapa kali gagal menyimpan basis data. Hal ini mungkin disebabkan oleh layanan sinkronisasi berkas yang menghalangi berkas yang akan disimpan.
-Nonaktifkan penyimpanan aman dan coba lagi?</translation>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Dikunci]</translation>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Hanya-baca]</translation>
     </message>
 </context>
 <context>
@@ -1085,37 +1494,13 @@ Nonaktifkan penyimpanan aman dan coba lagi?</translation>
         <translation>Mencari...</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>Ubah kunci utama</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>Hapus entri?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>Apakah Anda benar-benar ingin menghapus entri &quot;%1&quot; untuk selamanya?</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Hapus entri?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Apakah Anda benar-benar ingin menghapus entri %1 untuk selamanya?</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Pindahkan entri ke keranjang sampah?</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation>Apakah Anda benar-benar ingin memindahkan &quot;%1&quot; ke keranjang sampah?</translation>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Pindah entri ke keranjang sampah?</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation><numerusform>Apakah Anda benar-benar ingin memindahkan %n entri ke keranjang sampah?</numerusform></translation>
@@ -1133,18 +1518,10 @@ Nonaktifkan penyimpanan aman dan coba lagi?</translation>
         <translation>Ingat pilihan saya</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Hapus grup?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>Apakah Anda benar-benar ingin menghapus grup &quot;%1&quot; untuk selamanya?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Tidak bisa mengkalkulasi kunci utama</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>Tidak ada basis data.</translation>
     </message>
@@ -1179,10 +1556,6 @@ Do you want to merge your changes?</source>
 Apakah Anda ingin menggabungkan ubahan Anda?</translation>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>Tidak bisa membuka berkas basis data baru saat mencoba untuk memuat ulang basis data ini.</translation>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>Kosongkan keranjang sampah?</translation>
     </message>
@@ -1190,88 +1563,105 @@ Apakah Anda ingin menggabungkan ubahan Anda?</translation>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>Apakah Anda yakin ingin menghapus semuanya secara permanen dari keranjang sampah?</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>Buat Token TOTP</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation><numerusform>Hapus entri?</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation><numerusform>Pindahkan entri ke keranjang sampah?</numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Tutup</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Berkas terbuka dalam mode baca-saja.</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Umum</translation>
+        <source>Lock Database?</source>
+        <translation>Kunci Basis Data?</translation>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Sandi</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot; telah dimodifikasi.
+Simpan perubahan?</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>Kedaluwarsa</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation>Basis data telah diubah.
+Simpan perubahan?</translation>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Nama pengguna</translation>
+        <source>Save changes?</source>
+        <translation>Simpan perubahan?</translation>
     </message>
     <message>
-        <source>Autotype</source>
-        <translation>KetikOtomatis</translation>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>Pencarian</translation>
+        <source>Disable safe saves?</source>
+        <translation>Nonaktifkan penyimpanan aman?</translation>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>Atribut</translation>
+        <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 telah beberapa kali gagal menyimpan basis data. Hal ini mungkin disebabkan oleh layanan sinkronisasi berkas yang menghalangi berkas yang akan disimpan.
+Nonaktifkan penyimpanan aman dan coba lagi?</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Lampiran</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Catatan</translation>
+        <source>Passwords</source>
+        <translation>Sandi</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>Jendela</translation>
+        <source>Save database as</source>
+        <translation>Simpan basis data sebagai</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>Urutan</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Basis Data KeePass 2</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Cari</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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></translation>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Bersihkan</translation>
+        <source>Delete group</source>
+        <translation>Hapus grup</translation>
     </message>
     <message>
-        <source>Never</source>
-        <translation>Tidak Pernah</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[DILINDUNGI]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>Dinonaktifkan</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Diaktifkan</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1345,22 +1735,10 @@ Apakah Anda ingin menggabungkan ubahan Anda?</translation>
         <translation>Atribut baru</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Konfirmasi Buang</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>Apakah Anda yakin ingin membuang atribut ini?</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[DILINDUNGI]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation>Tekan ungkap untuk melihat atau menyunting</translation>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>Besok</translation>
     </message>
@@ -1373,10 +1751,6 @@ Apakah Anda ingin menggabungkan ubahan Anda?</translation>
         <translation><numerusform>%n bulan</numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 tahun</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation>Gunakan sandi yang dibuat?</translation>
     </message>
@@ -1388,6 +1762,26 @@ Apakah Anda ingin menggabungkan ubahan Anda?</translation>
         <source>Entry updated successfully.</source>
         <translation>Entri berhasil diperbarui.</translation>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation>Entri memiliki perubahan yang belum disimpan</translation>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation>Atribut baru %1</translation>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation>[DILINDUNGI] Tekan tampilkan untuk meninjau atau mnyunting</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n tahun</numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1633,6 +2027,81 @@ Apakah Anda ingin menggabungkan ubahan Anda?</translation>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Sandi:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1690,10 +2159,6 @@ Apakah Anda ingin menggabungkan ubahan Anda?</translation>
         <translation>Tidak bisa mengunduh favicon.</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Petunjuk: Anda bisa mengaktifkan Google sebagai cadangan di Perkakas&gt;Pengaturan&gt;Keamanan</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>Gambar</translation>
     </message>
@@ -1702,14 +2167,6 @@ Apakah Anda ingin menggabungkan ubahan Anda?</translation>
         <translation>Semua Berkas</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Pilih gambar</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read icon</source>
-        <translation>Tidak bisa membaca ikon</translation>
-    </message>
-    <message>
         <source>Custom icon already exists</source>
         <translation>Ikon khusus sudah ada</translation>
     </message>
@@ -1718,8 +2175,36 @@ Apakah Anda ingin menggabungkan ubahan Anda?</translation>
         <translation>Konfirmasi Hapus</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>Ikon ini digunakan oleh %1 entri, dan akan diganti oleh ikon bawaan. Apakah Anda yakin ingin menghapusnya?</translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation>Ikon khusus berhasil diunduh</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation>Pilih Gambar</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation><numerusform>Berhasil memuat %1 dari %n ikon</numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation><numerusform>%n ikon sudah ada didalam basis data</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1760,19 +2245,18 @@ Ini mungkin akan menyebabkan plugin terkait tidak berfungsi.</translation>
     </message>
     <message>
         <source>Key</source>
-        <translation type="unfinished"/>
+        <translation>Kunci</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation type="unfinished"/>
+        <translation>Nilai</translation>
     </message>
 </context>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation> - Salinan</translation>
+        <source>%1 - Clone</source>
+        <translation>%1 - Salinan</translation>
     </message>
 </context>
 <context>
@@ -1817,10 +2301,6 @@ Ini mungkin akan menyebabkan plugin terkait tidak berfungsi.</translation>
         <translation><numerusform>Apakah Anda yakin ingin membuang %n lampiran?</numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Konfirmasi Buang</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>Simpan lampiran</translation>
     </message>
@@ -1857,10 +2337,13 @@ Ini mungkin akan menyebabkan plugin terkait tidak berfungsi.</translation>
 %1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>Tidak bisa membuka berkas:
-%1</translation>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1944,6 +2427,106 @@ Ini mungkin akan menyebabkan plugin terkait tidak berfungsi.</translation>
         <source>Attachments</source>
         <translation>Lampiran</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>Ya</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>Buat Token TOTP</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Tutup</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Umum</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Nama pengguna</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Sandi</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Kedaluwarsa</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>Atribut</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Lampiran</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Catatan</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>KetikOtomatis</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Jendela</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Urutan</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Pencarian</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Cari</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Bersihkan</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Tidak Pernah</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[DILINDUNGI]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Diaktifkan</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Dinonaktifkan</translation>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EntryView</name>
@@ -1982,6 +2565,19 @@ Ini mungkin akan menyebabkan plugin terkait tidak berfungsi.</translation>
         <source>Recycle Bin</source>
         <translation>Tong Sampah</translation>
     </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation>[kosong]</translation>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>HostInstaller</name>
@@ -1995,61 +2591,6 @@ Ini mungkin akan menyebabkan plugin terkait tidak berfungsi.</translation>
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>Panjang:</translation>
-    </message>
-    <message>
-        <source>Character Types</source>
-        <translation>Tipe Karakter</translation>
-    </message>
-    <message>
-        <source>Upper Case Letters</source>
-        <translation>Huruf Besar</translation>
-    </message>
-    <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
-    </message>
-    <message>
-        <source>Lower Case Letters</source>
-        <translation>Huruf Kecil</translation>
-    </message>
-    <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
-    </message>
-    <message>
-        <source>Numbers</source>
-        <translation>Angka</translation>
-    </message>
-    <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
-    </message>
-    <message>
-        <source>Special Characters</source>
-        <translation>Karakter Spesial</translation>
-    </message>
-    <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
-    </message>
-    <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Kecualikan karakter mirip</translation>
-    </message>
-    <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>Pastikan sandi berisi karakter dari setiap grup</translation>
-    </message>
-    <message>
-        <source>Extended ASCII</source>
-        <translation>ASCII Lanjutan</translation>
-    </message>
-</context>
-<context>
     <name>KMessageWidget</name>
     <message>
         <source>&amp;Close</source>
@@ -2074,6 +2615,26 @@ Ini mungkin akan menyebabkan plugin terkait tidak berfungsi.</translation>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Kunci salah atau berkas basis data rusak.</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation>kehilangan tajuk basis data</translation>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>Ukuran id tajuk tidak valid</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>Panjang ruas tajuk tidak valid</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>Panjang data tajuk tidak valid</translation>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2233,10 +2794,6 @@ Ini mungkin akan menyebabkan plugin terkait tidak berfungsi.</translation>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation>Panjang uuid cipher tidak valid</translation>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation>Cipher tidak didukung</translation>
     </message>
@@ -2290,6 +2847,18 @@ Ini adalah migrasi satu arah. Anda tidak akan bisa membuka basis data yang diimp
         <source>Unsupported KeePass 2 database version.</source>
         <translation>Versi basis data KeePass 2 tidak didukung.</translation>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation>Tidak bisa mengurai UUID: %1</translation>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2362,10 +2931,6 @@ Ini adalah migrasi satu arah. Anda tidak akan bisa membuka basis data yang diimp
         <translation>Elemen riwayat dengan uuid yang berbeda</translation>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation>Tidak bisa mendekripsi lema entri</translation>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation>Ditemukan atribut khusus ganda</translation>
     </message>
@@ -2414,6 +2979,14 @@ Ini adalah migrasi satu arah. Anda tidak akan bisa membuka basis data yang diimp
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation>Tidak bisa mengurai kompresi binari</translation>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation>Galat XML:
+%1
+Baris %2, kolom %3</translation>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2577,28 +3150,127 @@ Ini adalah migrasi satu arah. Anda tidak akan bisa membuka basis data yang diimp
         <source>Invalid entry field type</source>
         <translation>Tipe ruas entri tidak valid</translation>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <source>Disabled share</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>Berkas penguncian tidak bisa dibuat. Mode aplikasi tunggal dinonaktifkan.</translation>
+        <source>Import from</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Aplikasi KeePassXC lainnya sudah berjalan.</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Galat saat menguji fungsi kriptografi.</translation>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Galat</translation>
+        <source>Key Component</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Batal</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation>Tambah %1</translation>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation>Ubah %1</translation>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation>Buang %1</translation>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>Telusuri</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Buat</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation>Berkas Kunci</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"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation>Format berkas kunci legacy</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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation>Galat memuat berkas kunci &apos;%1&apos;
+Pesan: %2</translation>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Berkas kunci</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Semua Berkas</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Buat Berkas Kunci...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation>Galat membuat berkas kunci</translation>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation>Tidak bisa membuat berkas: %1</translation>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Pilih berkas kunci</translation>
     </message>
 </context>
 <context>
@@ -2612,10 +3284,6 @@ Ini adalah migrasi satu arah. Anda tidak akan bisa membuka basis data yang diimp
         <translation>Basis data ba&amp;ru-baru ini</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Impor</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation>&amp;Bantuan</translation>
     </message>
@@ -2624,14 +3292,6 @@ Ini adalah migrasi satu arah. Anda tidak akan bisa membuka basis data yang diimp
         <translation>E&amp;ntri</translation>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>Salin at&amp;ribut ke papan klip</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation>Sandi sekali berdasar waktu</translation>
-    </message>
-    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Grup</translation>
     </message>
@@ -2660,30 +3320,10 @@ Ini adalah migrasi satu arah. Anda tidak akan bisa membuka basis data yang diimp
         <translation>&amp;Tutup basis data</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>Basis data &amp;baru</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>Gabungkan dari basis data KeePassX</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>&amp;Tambah entri baru</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>&amp;Lihat/Sunting entri</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>&amp;Hapus entri</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>&amp;Tambah grup baru</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>&amp;Sunting grup</translation>
     </message>
@@ -2696,14 +3336,6 @@ Ini adalah migrasi satu arah. Anda tidak akan bisa membuka basis data yang diimp
         <translation>&amp;Simpan basis data sebagai...</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Ubah kunci &amp;utama...</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>Pengaturan &amp;basis data</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>Pengaturan basis data</translation>
     </message>
@@ -2712,10 +3344,6 @@ Ini adalah migrasi satu arah. Anda tidak akan bisa membuka basis data yang diimp
         <translation>&amp;Gandakan entri</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>&amp;Temukan</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>Salin &amp;nama pengguna</translation>
     </message>
@@ -2724,10 +3352,6 @@ Ini adalah migrasi satu arah. Anda tidak akan bisa membuka basis data yang diimp
         <translation>Salin nama pengguna ke papan klip</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>Salin &amp;sandi</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>Salin sandi ke papan klip</translation>
     </message>
@@ -2740,14 +3364,6 @@ Ini adalah migrasi satu arah. Anda tidak akan bisa membuka basis data yang diimp
         <translation>Pembuat Sandi</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation>Jalankan &amp;Ketik-Otomatis</translation>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>&amp;Buka URL</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>&amp;Kunci basis data</translation>
     </message>
@@ -2780,22 +3396,6 @@ Ini adalah migrasi satu arah. Anda tidak akan bisa membuka basis data yang diimp
         <translation>&amp;Ekspor ke berkas CSV...</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Impor basis data KeePass 1...</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>Impor berkas CSV...</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Per&amp;baiki basis data...</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>Tampilkan TOTP</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>Siapkan TOTP...</translation>
     </message>
@@ -2816,14 +3416,6 @@ Ini adalah migrasi satu arah. Anda tidak akan bisa membuka basis data yang diimp
         <translation>Galat akses untuk berkas konfigurasi %1</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Sepertinya Anda menggunakan KeePassHTTP untuk integrasi peramban. Fitur ini tidak berlaku lagi dan akan dibuang di masa depan.&lt;br&gt;Silakan beralih ke KeePassXC-Browser! Untuk bantuan migrasi, kunjungi &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;panduan migrasi&lt;/a&gt; kami (peringatan %1 of 3).&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>baca-saja</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Pengaturan</translation>
     </message>
@@ -2836,36 +3428,277 @@ Ini adalah migrasi satu arah. Anda tidak akan bisa membuka basis data yang diimp
         <translation>Keluar KeePassXC</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Basis Data KeePass 2</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Silakan sentuh tombol pada YubiKey Anda!</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Semua Berkas</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation>PERINGATAN! Anda menggunakan versi tidak stabil dari KeePassXC!
+Tinggi kemungkinan terjadi kerusakan, harap kelola salinan basis data anda dengan baik.
+Versi ini tidak dimaksudkan untuk penggunaan sehari-hari.</translation>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Buka basis data</translation>
+        <source>&amp;Donate</source>
+        <translation>&amp;Donasi</translation>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Simpan basis data yang sudah diperbaiki</translation>
+        <source>Report a &amp;bug</source>
+        <translation>Laporkan &amp;bug</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Gagal menyimpan basis data.</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Silakan sentuh tombol pada YubiKey Anda!</translation>
+        <source>&amp;Import</source>
+        <translation>&amp;Impor</translation>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
-        <translation>PERINGATAN! Anda menggunakan versi tidak stabil dari KeePassXC!
-Tinggi kemungkinan terjadi kerusakan, harap kelola salinan basis data anda dengan baik.
-Versi ini tidak dimaksudkan untuk penggunaan sehari-hari.</translation>
+        <source>Copy att&amp;ribute...</source>
+        <translation>Salin at&amp;ribut...</translation>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation>TOTP...</translation>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation>Basis data bar&amp;u...</translation>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation>Buat basis data baru</translation>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation>Gabung dari basis data KDBX lainnya</translation>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation>E&amp;ntri baru</translation>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation>Tambahkan entri baru</translation>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation>&amp;Sunting entri</translation>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation>Lihat atau sunting entri</translation>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation>&amp;Grup baru</translation>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation>Tambahkan grup baru</translation>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation>Ganti &amp;kunci master...</translation>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation>Pengaturan basis &amp;data...</translation>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation>Salin &amp;sandi</translation>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation>Jalankan &amp;Ketik-Otomatis</translation>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation>Buka &amp;URL</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation>Basis data KeePass 1...</translation>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation>Impor basis data KeePass 1</translation>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation>Berkas CSV...</translation>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation>Impor berkas CSV</translation>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation>Tampilkan TOTP...</translation>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation>Tampilkan Kode QR TOTP...</translation>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation>Memindahkan %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation>Buat basis data KeePassXC baru...</translation>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Root</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>LamanPemandu</translation>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation>Pengaturan En&amp;kripsi</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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Pengaturan Lanjutan</translation>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation>Pengaturan Dasar</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <translation>Pengaturan Enkripsi</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 type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation>Kunci Master Basis Data</translation>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <translation>Informasi Basis Data Umum</translation>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2968,125 +3801,34 @@ Versi ini tidak dimaksudkan untuk penggunaan sehari-hari.</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>Ini dibutuhkan untuk mengakses basis data Anda dari ChromeIPass atau PassIFox</translation>
-    </message>
-    <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>Aktifkan server KeePassHTTP</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Umum</translation>
-    </message>
-    <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>&amp;Tampilkan notifikasi ketika ada permintaan kredensial</translation>
-    </message>
-    <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>Hanya tampilkan kecocokan terbaik untuk URL tertentu bukan semua entri untuk keseluruhan domain.</translation>
-    </message>
-    <message>
-        <source>&amp;Return only best matching entries</source>
-        <translation>Hanya &amp;tampilkan entri dengan kecocokan terbaik</translation>
-    </message>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>&amp;Minta untuk membuka basis data jika terkunci</translation>
-    </message>
-    <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation>Hanya entri dengan skema yang sama (http://, https://, ftp://, ...) yang ditampilkan.</translation>
-    </message>
-    <message>
-        <source>&amp;Match URL schemes</source>
-        <translation>&amp;Cocok skema URL</translation>
-    </message>
-    <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Urutkan entri yang cocok berdasarkan &amp;nama pengguna</translation>
-    </message>
-    <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Urutkan entri yang cocok berdasarkan &amp;judul</translation>
-    </message>
-    <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>&amp;Buang semua kunci enkripsi bersama dari basis data aktif</translation>
-    </message>
-    <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>&amp;Buang semua izin yang tersimpan dari entri di dalam basis data aktif</translation>
-    </message>
-    <message>
-        <source>Password Generator</source>
-        <translation>Pembuat Sandi</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Tingkat Lanjut</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Selalu izinkan &amp;akses ke entri</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Selalu izinkan pembar&amp;uan entri</translation>
-    </message>
-    <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>Hanya basis data terpilih yang harus terkoneksi dengan klien.</translation>
-    </message>
-    <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>&amp;Cari di dalam semua basis data yang terbuka untuk entri yang cocok</translation>
-    </message>
-    <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>Membuat atau memperbarui ruas lema secara otomatis tidak didukung.</translation>
-    </message>
-    <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>&amp;Tampilkan ruas lema tingkat lanjut yang dimulai dengan &quot;KPH: &quot;</translation>
-    </message>
-    <message>
-        <source>HTTP Port:</source>
-        <translation>Port HTTP:</translation>
+        <source>Enter password:</source>
+        <translation>Masukkan sandi:</translation>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Port bawaan: 19455</translation>
+        <source>Confirm password:</source>
+        <translation>Konfirmasi sandi:</translation>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC akan mendengarkan port ini pada 127.0.0.1</translation>
+        <source>Password</source>
+        <translation>Sandi</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;Peringatan:&lt;/b&gt; Opsi berikut bisa berbahaya!</translation>
+        <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"/>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;KeePassHTTP sudah tidak berlaku lagi dan akan dibuang di masa depan.&lt;br&gt;Silakan beralih ke KeePassXC-Browser! Untuk bantuan migrasi, kunjungi &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;panduan migrasi&lt;/a&gt;kami.&lt;/p&gt;</translation>
+        <source>Password cannot be empty.</source>
+        <translation>Sandi tidak boleh kosong.</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation type="unfinished"/>
+        <source>Passwords do not match.</source>
+        <translation>Sandi tidak sama.</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Tidak bisa mengkoneksi ke port dibawah 1024!
-Menggunakan port bawaan 19455.</translation>
+        <source>Generate master password</source>
+        <translation>Buat sandi master</translation>
     </message>
 </context>
 <context>
@@ -3157,18 +3899,10 @@ Menggunakan port bawaan 19455.</translation>
         <translation>Daftar Kata:</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Jumlah Kata:</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>Pemisah Kata:</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>Buat</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Salin</translation>
     </message>
@@ -3181,10 +3915,6 @@ Menggunakan port bawaan 19455.</translation>
         <translation>Tutup</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>Terapkan</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>Entropi: %1 bit</translation>
     </message>
@@ -3212,6 +3942,171 @@ Menggunakan port bawaan 19455.</translation>
         <comment>Password quality</comment>
         <translation>Sempurna</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation>ASCIILanjutan</translation>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation>Beralih ke mode lanjutan</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Tingkat Lanjut</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation>Huruf Besar A sampai F</translation>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation>Huruf Kecil A sampai F</translation>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation>Tanda Kurung</translation>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation>{[(</translation>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation>Tanda Baca</translation>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation>.,:;</translation>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation>Tanda Petik</translation>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation>&quot; &apos;</translation>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation>Tanda Hitung</translation>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation>&lt;*+!?=</translation>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation>\_|-/</translation>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation>Logogram</translation>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation>#$%&amp;&amp;@^`~</translation>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation>Beralih ke mode dasar</translation>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation>Dasar</translation>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation>Karakter yang dikecualikan dari sandi yang dibuat</translation>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation>Jangan sertakan:</translation>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation>Tambahkan huruf bukan-hex ke daftar &quot;jangan sertakan&quot;</translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation>Hex</translation>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation>Karakter yang dikecualikan: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</translation>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation>&amp;Jumlah Kata:</translation>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation>Buat ulang</translation>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Hapus</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Buang</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Nonaktifkan</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3232,34 +4127,18 @@ Menggunakan port bawaan 19455.</translation>
         <translation>Tidak bisa mendekripsi pesan</translation>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
-        <translation>Terputus atau tidak bisa menyambung ke KeePassXC</translation>
-    </message>
-    <message>
         <source>Action cancelled or denied</source>
         <translation>Tindakan dibatalkan atau ditolak</translation>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation>Tidak bisa mengenkripsi pesan atau kunci publik tidak ditemukan. Apakah Perpesanan Native diaktifkan di dalam KeePassXC?</translation>
-    </message>
-    <message>
         <source>KeePassXC association failed, try again</source>
         <translation>Asosiasi KeePassXC gagal, coba lagi</translation>
     </message>
     <message>
-        <source>Key change was not successful</source>
-        <translation>Perubahan kunci tidak berhasil</translation>
-    </message>
-    <message>
         <source>Encryption key is not recognized</source>
         <translation>Kunci enkripsi tidak dikenali</translation>
     </message>
     <message>
-        <source>No saved databases found</source>
-        <translation>Tidak ditemukan basis data tersimpan</translation>
-    </message>
-    <message>
         <source>Incorrect action</source>
         <translation>Tindakan salah</translation>
     </message>
@@ -3385,10 +4264,6 @@ Menggunakan port bawaan 19455.</translation>
         <translation>Masukkan sandi untuk membuka %1: </translation>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation>Gagal memuat berkas kunci %1 : %2</translation>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3473,12 +4348,6 @@ Perintah yang tersedia:
         <translation>galat membaca dari perangkat</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>berkas kosong !
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation>lema rusak</translation>
     </message>
@@ -3487,30 +4356,6 @@ Perintah yang tersedia:
         <translation>kehilangan tanda kutip tutup</translation>
     </message>
     <message>
-        <source>AES: 256-bit</source>
-        <translation>AES: 256-bit</translation>
-    </message>
-    <message>
-        <source>Twofish: 256-bit</source>
-        <translation>Twofish: 256-bit</translation>
-    </message>
-    <message>
-        <source>ChaCha20: 256-bit</source>
-        <translation>ChaCha20: 256-bit</translation>
-    </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – direkomendasikan)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 4)</source>
-        <translation>AES-KDF (KDBX 4)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 3.1)</source>
-        <translation>AES-KDF (KDBX 3.1)</translation>
-    </message>
-    <message>
         <source>Group</source>
         <translation>Grup</translation>
     </message>
@@ -3539,10 +4384,6 @@ Perintah yang tersedia:
         <translation>Dibuat</translation>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
-        <translation>Integrasi Peramban Legacy</translation>
-    </message>
-    <message>
         <source>Browser Integration</source>
         <translation>Integrasi Peramban</translation>
     </message>
@@ -3571,10 +4412,6 @@ Perintah yang tersedia:
         <translation>Jumlah kata untuk frasa sandi diceware.</translation>
     </message>
     <message>
-        <source>count</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Wordlist for the diceware generator.
 [Default: EFF English]</source>
         <translation>Daftar kata untuk generator diceware.
@@ -3585,28 +4422,438 @@ Perintah yang tersedia:
         <translation>Buat kata sandi baru secara acak.</translation>
     </message>
     <message>
-        <source>Length of the generated password.</source>
-        <translation>Panjang kata sandi yang dibuat.</translation>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation>Masukkan sandi untuk entri baru:</translation>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
-        <translation>Gunakan huruf kecil di kata sandi yang dibuat</translation>
+        <source>Type: Bruteforce</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
-        <translation>Gunakan huruf besar di kata sandi yang dibuat.</translation>
+        <source>Type: Dictionary</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
-        <translation>Gunakan angka di kata sandi yang dibuat.</translation>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
-        <translation>Gunakan spesial karakter di kata sandi yang dibuat.</translation>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
-        <translation>Gunakan ASCII yang diperluas di dalam sandi yang dibuat.</translation>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>Berkas %1 tidak ada.</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Tidak bisa membuka berkas %1.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256-bit</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256-bit</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256-bit</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – direkomendasikan)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>Buang sebuah entri dari basis data.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>Jalur entri untuk dibuang.</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Berkas penguncian tidak bisa dibuat. Mode aplikasi tunggal dinonaktifkan.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - pengelola sandi lintas platform</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>nama berkas basis data sandi untuk dibuka (*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>jalur ke berkas konfigurasi khusus</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>berkas kunci basis data</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>baca sandi basis data dari stdin</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Aplikasi KeePassXC lainnya sudah berjalan.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Galat saat menguji fungsi kriptografi.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Galat</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation>Sandi basis data:</translation>
     </message>
 </context>
 <context>
@@ -3644,12 +4891,98 @@ Perintah yang tersedia:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
+    <message>
+        <source>Agent connection failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <source>Search...</source>
-        <translation>Cari...</translation>
+        <source>exclude term from results</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation type="unfinished"/>
     </message>
     <message>
+        <source>logical OR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
         <source>Search</source>
         <translation>Cari</translation>
     </message>
@@ -3658,314 +4991,316 @@ Perintah yang tersedia:
         <translation>Bersihkan</translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Sensitif Besar Kecil</translation>
-    </message>
-    <message>
         <source>Limit search to selected group</source>
         <translation>Batasi pencarian ke grup yang dipilih</translation>
     </message>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation>Sensitif besar kecil huruf</translation>
+    </message>
 </context>
 <context>
-    <name>Service</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC: Permintaan asosiasi kunci baru</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation>Anda telah menerima permintaan asosiasi untuk kunci di atas.
-Jika Anda ingin mengizinkannya mengakses basis data KeePassXC Anda,
-beri nama yang unik untuk identifikasi dan terimalah.</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: Timpa kunci yang ada?</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Kunci enkripsi bersama dengan nama &quot;%1&quot; sudah ada.
-Apakah Anda ingin menimpanya?</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: Perbarui Entri</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Apakah Anda ingin memperbarui informasi dalam %1 - %2?</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Basis data dikunci!</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Basis data aktif dikunci!
-Silakan buka kunci atau pilih yang lainnya yang tidak terkunci.</translation>
+        <source>Key:</source>
+        <translation>Kunci:</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Buang kunci dari basis data</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation><numerusform>Berhasil membuang %n kunci enkripsi dari Pengaturan KeePassX/Http</numerusform></translation>
+        <source>Generate</source>
+        <translation>Buat</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Tidak ada kunci yang ditemukan</translation>
+        <source>Import</source>
+        <translation>Impor</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>Tidak ada kunci-enkripsi bersama yang ditemukan di dalam Pengaturan KeePassHttp.</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Pengaturan tidak tersedia!</translation>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>Basis data aktif tidak berisi entri Pengaturan KeePassHttp.</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>Membuang izin yang tersimpan...</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>Batal</translation>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Buang izin</translation>
+        <source>Remove</source>
+        <translation>Buang</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation><numerusform>Berhasil membuang perizinan dari %n entri.</numerusform></translation>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Tidak entri dengan izin yang ditemukan!</translation>
+        <source>Status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Basis data aktif tidak berisi entri dengan izin.</translation>
+        <source>Fingerprint</source>
+        <translation>Tanda tangan</translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
-        <translation>Pengaturan Aplikasi</translation>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Umum</translation>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>Keamanan</translation>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>Galat akses untuk berkas konfigurasi %1</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>Pengaturan Dasar</translation>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Hanya mulai satu aplikasi KeePassXC</translation>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>Ingat basis data terakhir</translation>
+        <source>All files</source>
+        <translation>Semua Berkas</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Ingat berkas kunci dan dongle keamanan terakhir</translation>
+        <source>Select path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Muat basis data sebelumnya saat mulai</translation>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>Otomatis simpan ketika keluar</translation>
+        <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"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>Otomatis simpan setelah setiap perubahan</translation>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Muat ulang basis data secara otomatis ketika diubah secara eksternal</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>Minimalkan ketika menyalin ke papan klip</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Minimalkan jendela saat memulai aplikasi</translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>Gunakan ikon grup pada pembuatan entri</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Jangan tandai basis data telah diubah untuk perubahan non-data (mis. melebarkan grup)</translation>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
-        <translation>Sembunyikan tampilan Detail</translation>
+        <source>Never</source>
+        <translation>Tidak Pernah</translation>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>Tampilkan ikon baki sistem</translation>
+        <source>Always</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>Sembunyikan jendela ke baki sistem ketika diminimalkan</translation>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
-        <translation>Daripada keluar, sembunyikan jendela ke baki sistem</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
-        <translation>Ikon baki sistem gelap</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Bahasa</translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Ketik-Otomatis</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>Gunakan judul entri untuk mencocokkan jendela untuk Ketik-Otomatis global</translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>Gunakan URL entri untuk mencocokkan jendela untuk Ketik-Otomatis global</translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation>Selalu bertanya sebelum menjalankan Ketik-Otomatis</translation>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Pintasan global Ketik-Otomatis</translation>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>Tundaan Ketik-Otomatis</translation>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation>md</translation>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
-        <translation>Memulai</translation>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
-        <translation>Manajemen Berkas</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation>Secara aman menyimpan berkas basis data (mungkin tidak kompatibel dengan Dropbox, dll)</translation>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
-        <translation>Cadangkan basis data sebelum disimpan</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
-        <translation>Manajemen Entri</translation>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Umum</translation>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
-        <translation>Waktu Kedaluwarsa</translation>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>Kosongkan papan klip setelah</translation>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>det</translation>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>Kunci basis data setelah tidak aktif selama</translation>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Kenyamanan</translation>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Kunci basis data ketika sesi dikunci atau lid ditutup</translation>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>Kunci basis data setelah meminimalkan jendela</translation>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>TotpDialog</name>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>Tidak membutuhkan pengulangan sandi ketika ruas bisa dilihat</translation>
+        <source>Timed Password</source>
+        <translation>Sandi Berwaktu</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Tampilkan teks sandi secara baku</translation>
+        <source>000000</source>
+        <translation>000000</translation>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
-        <translation>Sembunyikan sandi di dalam panel pratinjau</translation>
+        <source>Copy</source>
+        <translation>Salin</translation>
+    </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
     <message>
-        <source>Hide entry notes by default</source>
-        <translation>Sembunyikan catatan secara bawaan</translation>
+        <source>Copy</source>
+        <translation>Salin</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>Privasi</translation>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>Gunakan Google sebagai cadangan untuk mengunduh ikon situs web</translation>
+        <source>There was an error creating the QR code.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
-        <translation>Kunci ulang basis data yang sebelumnya terkunci setelah menjalankan Ketik-Otomatis</translation>
+        <source>Closing in %1 seconds.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation>Siapkan TOTP</translation>
@@ -3987,59 +5322,84 @@ Silakan buka kunci atau pilih yang lainnya yang tidak terkunci.</translation>
         <translation>Gunakan pengaturan khusus</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>Catatan: Hanya ubah pengaturan ini jika Anda tahu apa yang Anda lakukan.</translation>
+        <source>Custom Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Time step:</source>
         <translation>Interval waktu:</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8 angka</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>det</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>Ukuran kode:</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6 angka</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>Ukuran kode:</translation>
+        <source>7 digits</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>det</translation>
+        <source>8 digits</source>
+        <translation>8 angka</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>Sandi Berwaktu</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Salin</translation>
+        <source>Close</source>
+        <translation>Tutup</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>Kedaluwarsa dalam</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>detik</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>Buka kunci basis data</translation>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4074,41 +5434,25 @@ Silakan buka kunci atau pilih yang lainnya yang tidak terkunci.</translation>
     </message>
 </context>
 <context>
-    <name>main</name>
-    <message>
-        <source>Remove an entry from the database.</source>
-        <translation>Buang sebuah entri dari basis data.</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>Jalur ke basis data.</translation>
-    </message>
-    <message>
-        <source>Path of the entry to remove.</source>
-        <translation>Jalur entri untuk dibuang.</translation>
-    </message>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - pengelola sandi lintas platform</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>nama berkas basis data sandi untuk dibuka (*.kdbx)</translation>
+        <source>Refresh</source>
+        <translation>Segarkan</translation>
     </message>
     <message>
-        <source>path to a custom config file</source>
-        <translation>jalur ke berkas konfigurasi khusus</translation>
+        <source>YubiKey Challenge-Response</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>berkas kunci basis data</translation>
+        <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"/>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>baca sandi basis data dari stdin</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Parent window handle</source>
+        <source>No YubiKey inserted.</source>
         <translation type="unfinished"/>
     </message>
 </context>
diff --git a/share/translations/keepassx_is_IS.ts b/share/translations/keepassx_is_IS.ts
new file mode 100644
index 000000000..eba0192ad
--- /dev/null
+++ b/share/translations/keepassx_is_IS.ts
@@ -0,0 +1,5423 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="is_IS" version="2.1">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <source>About KeePassXC</source>
+        <translation>Um KeePassXC</translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation>Um</translation>
+    </message>
+    <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Contributors</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Debug Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>Vista í minni</translation>
+    </message>
+    <message>
+        <source>Revision: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Distribution: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Libraries:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Operating system: %1
+CPU architecture: %2
+Kernel: %3 %4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled extensions:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Special thanks from the KeePassXC team go to debfx for creating the original KeePassX.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Version %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Build Type: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>YubiKey</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
+    <message>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation>Virkja SSH miðil (krefst endurræsunar)</translation>
+    </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AutoType</name>
+    <message>
+        <source>Couldn&apos;t find an entry that matches the window title:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AutoTypeAssociationsModel</name>
+    <message>
+        <source>Window</source>
+        <translation>Gluggi</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Default sequence</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AutoTypeMatchModel</name>
+    <message>
+        <source>Group</source>
+        <translation>Grúppa</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Titill</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Notandanafn</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AutoTypeSelectDialog</name>
+    <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select entry to Auto-Type:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
+    <message>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember this decision</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>Leyfa</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Neita</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"/>
+    </message>
+</context>
+<context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation>&amp;Vivaldi</translation>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation type="unfinished"/>
+    </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: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not ask permission for HTTP &amp;Basic Auth</source>
+        <extracomment>An extra HTTP Basic Auth setting</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Converting attributes to custom data…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CloneDialog</name>
+    <message>
+        <source>Clone Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Replace username and password with references</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy history</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CsvImportWidget</name>
+    <message>
+        <source>Import CSV fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>filename</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>size, rows, columns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encoding</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Codec</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text is qualified by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fields are separated by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comments start with</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>First record has field names</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of headers line to discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Consider &apos;\&apos; an escape character</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Preview</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Column layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not present in CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Imported from CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Original data: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty fieldname %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>column %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error(s) detected in CSV file!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CsvParserModel</name>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n byte(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n row(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenWidget</name>
+    <message>
+        <source>Enter master key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key File:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TouchID for quick unlock</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can't open key file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
+    <message>
+        <source>Passwords</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
+    <message>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Master Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetBrowser</name>
+    <message>
+        <source>KeePassXC-Browser settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Stored keys</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete the selected key?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES:  256 Bit   (default)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish:  256 Bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Derivation Function:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Additional Database Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable &amp;compression (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetKeeShare</name>
+    <message>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
+    <message>
+        <source>Add additional protection...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No encryption key added</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No password set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to change master key</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
+    <message>
+        <source>Database Name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
+    <message>
+        <source>KeePass 2 Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export database to CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database creation error</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseWidget</name>
+    <message>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Do you really want to move %n entry(s) to the recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Execute command?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember my choice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No current database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No source database, nothing to do.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search Results (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No Results</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File has changed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The database file has changed. Do you want to load the changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
+        <translation type="unfinished"/>
+    </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>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>File opened in read only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock Database?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable safe saves?</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passwords</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save database as</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 2 Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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>
+    </message>
+    <message>
+        <source>Delete group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidget</name>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Different passwords supplied.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Tomorrow</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Apply generated password?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you want to apply the generated password to this entry?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry updated successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetAdvanced</name>
+    <message>
+        <source>Additional attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Protect</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reveal</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Foreground Color:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Background Color:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetAutoType</name>
+    <message>
+        <source>Enable Auto-Type for this entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>-</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Window title:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a specific sequence for this association:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetHistory</name>
+    <message>
+        <source>Show</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete all</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetMain</name>
+    <message>
+        <source>URL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Repeat:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Presets</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>Vista í minni</translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditGroupWidget</name>
+    <message>
+        <source>Group</source>
+        <translation>Grúppa</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Inherit from parent group (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditGroupWidgetMain</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Use default Auto-Type sequence of parent group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Set default Auto-Type se&amp;quence</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditWidgetIcons</name>
+    <message>
+        <source>&amp;Use default icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add custom icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete custom icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Download favicon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Custom icon already exists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm Delete</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Custom icon successfully downloaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>EditWidgetProperties</name>
+    <message>
+        <source>Created:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modified:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Accessed:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Uuid:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Plugin Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete plugin data?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to delete the selected plugin data?
+This may cause the affected plugins to malfunction.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Entry</name>
+    <message>
+        <source>%1 - Clone</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
+%1</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttributesModel</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryHistoryModel</name>
+    <message>
+        <source>Last modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Titill</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Notandanafn</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryModel</name>
+    <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation>Grúppa</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Titill</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Notandanafn</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Accessed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Notandanafn</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Gluggi</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryView</name>
+    <message>
+        <source>Customize View</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide Usernames</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide Passwords</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fit to window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fit to contents</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reset to defaults</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments (icon)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Group</name>
+    <message>
+        <source>Recycle Bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KMessageWidget</name>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close message</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeePass1OpenWidget</name>
+    <message>
+        <source>Import KeePass1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open the database.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeePass1Reader</name>
+    <message>
+        <source>Unable to read keyfile.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported encryption algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass database version.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Root</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key transformation failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group field type number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group id field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group creation time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group modification time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group expiry time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group level field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group field type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing group id or level</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing entry field type number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry modification time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry field type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeeShare</name>
+    <message>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
+    <message>
+        <source>Key Component</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Recent databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>E&amp;ntries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Tools</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;About</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Open database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Save database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Close database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Delete entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Edit group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Delete group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sa&amp;ve database as...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Clone entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy username to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy password to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password Generator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Lock databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy title to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy URL to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy notes to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Export to CSV file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Set up TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>E&amp;mpty recycle bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Toggle window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quit KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Donate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Report a &amp;bug</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy att&amp;ribute...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>OpenSSHKey</name>
+    <message>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Base64 decoding failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file way too small.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file magic header id invalid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Found zero keys</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read public key.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No private key payload to decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Trying to run KDF without cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF while reading private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key type: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cipher IV is too short for MD5 kdf</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown KDF: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown key type: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PasswordEditWidget</name>
+    <message>
+        <source>Enter password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Password cannot be empty.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passwords do not match.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate master password</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PasswordGeneratorWidget</name>
+    <message>
+        <source>%p%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character Types</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Upper Case Letters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lower Case Letters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Numbers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Special Characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude look-alike characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Pick characters from every group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Length:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passphrase</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wordlist:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Separator:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy: %1 bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password Quality: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Poor</source>
+        <comment>Password quality</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Weak</source>
+        <comment>Password quality</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Good</source>
+        <comment>Password quality</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excellent</source>
+        <comment>Password quality</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Database not opened</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database hash not available</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Client public key not received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot decrypt message</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>NULL device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>error reading from device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>malformed string</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>missing closing quote</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation>Grúppa</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Titill</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Notandanafn</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Last Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Press</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new random diceware passphrase.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word count for the diceware passphrase.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wordlist for the diceware generator.
+[Default: EFF English]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new random password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QtIOCompressor</name>
+    <message>
+        <source>Internal zlib error when compressing: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error writing to underlying device: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error opening underlying device: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading data from underlying device: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Internal zlib error when decompressing: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QtIOCompressor::open</name>
+    <message>
+        <source>The gzip format not supported in this version of zlib.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Internal zlib error: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SSHAgent</name>
+    <message>
+        <source>Agent connection failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Limit search to selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SettingsWidgetKeeShare</name>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Signer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Trust</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ask</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ShareObserver</name>
+    <message>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Always</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TotpDialog</name>
+    <message>
+        <source>Timed Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>000000</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>There was an error creating the QR code.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Closing in %1 seconds.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TotpSetupDialog</name>
+    <message>
+        <source>Setup TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use custom settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Custom Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Time step:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>6 digits</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>7 digits</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>8 digits</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>UpdateCheckDialog</name>
+    <message>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WelcomeWidget</name>
+    <message>
+        <source>Start storing your passwords securely in a KeePassXC database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create new database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open existing database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from KeePass 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from CSV</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recent databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Welcome to KeePassXC %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>YubiKeyEditWidget</name>
+    <message>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>YubiKey Challenge-Response</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No YubiKey inserted.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+</TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_it.ts b/share/translations/keepassx_it.ts
index fa24d81bf..c519be82d 100644
--- a/share/translations/keepassx_it.ts
+++ b/share/translations/keepassx_it.ts
@@ -38,12 +38,6 @@
         <translation>Copia negli appunti</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>Versione %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>Revisione: %1</translation>
     </message>
@@ -76,35 +70,48 @@ Kernel: %3 %4</translation>
         <translation>Uno speciale ringraziamento dal team di KeePassXC va a debfx per la creazione del KeePassX originale.</translation>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
-        <translation>Tipo di compilazione: %1
-</translation>
+        <source>Version %1</source>
+        <translation>Versione %1</translation>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>Conferma l&apos;accesso per KeePassXC HTTP</translation>
+        <source>Build Type: %1</source>
+        <translation>Tipo di compilazione: %1</translation>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>Ricorda questa scelta</translation>
+        <source>Auto-Type</source>
+        <translation>Completamento automatico</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Consenti</translation>
+        <source>Browser Integration</source>
+        <translation>Integrazione con i browser</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>Nega</translation>
+        <source>SSH Agent</source>
+        <translation>Agente SSH</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>%1 ha richiesto accesso alle password per il seguente elemento/i.
-Seleziona se vuoi consentire l&apos;accesso.</translation>
+        <source>YubiKey</source>
+        <translation>YubiKey</translation>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation>TouchID</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Nessuno</translation>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -113,6 +120,277 @@ Seleziona se vuoi consentire l&apos;accesso.</translation>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>Abilita agente SSH (richiede un riavvio)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Impostazioni applicazione</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Generale</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Sicurezza</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Errore di accesso per il file di configurazione %1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Impostazioni di base</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>Avvio</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Avvia una sola istanza di KeePassXC</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Ricorda ultimo database</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Ricorda gli ultimi file chiave e dongle di sicurezza</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Carica i database precedenti all&apos;avvio</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>Minimizza la finestra all&apos;avvio della applicazione</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>Gestione dei file</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation>Salvataggio sicuro dei file di database (potrebbe essere incompatibile con Dropbox, ecc)</translation>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation>Effettua una copia di sicurezza del database prima di salvarlo</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Salva automaticamente dopo ogni modifica</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Salva automaticamente all&apos;uscita</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Non contrassegnare il database come modificato per modifiche non riguardanti i dati (ad es. espansione dei gruppi)</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Ricarica automaticamente il database quando ci sono modifiche esterne</translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>Gestione dell&apos;elemento</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>Usa icona del gruppo alla creazione di una voce</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Minimizza quando si copia negli appunti</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation>Nascondere il pannello di anteprima della voce</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Generale</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation>Nascondere la barra degli strumenti (icone)</translation>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation>Minimizzare invece di uscire dall&apos;app</translation>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Visualizza un&apos;icona nell&apos;area di notifica di sistema</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>Icona scura per l&apos;area di notifica di sistema</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Nascondi la finestra nell&apos;area di notifica di sistema quando viene minimizzata</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Lingua</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Completamento automatico</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>Usa il titolo della voce per la corrispondenza con le finestre per il completamento automatico globale</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>Usa URL della voce per la corrispondenza con le finestre per il completamento automatico globale</translation>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>Chiedi sempre prima di effettuare il completamento automatico</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Scorciatoia globale per l&apos;auto-completamento</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation>Ritardo per la compilazione automatica</translation>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation> ms</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation>Ritardo di avvio della compilazione automatica</translation>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>Timeout</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>Svuota gli appunti dopo</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> sec</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>Blocca i database dopo un&apos;inattività di</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation> min</translation>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>Comodità</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Blocca i database quando la sessione è bloccata o il coperchio è chiuso</translation>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>Blocca il database dopo la minimizzazione della finestra</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation>Blocca nuovamente un database precedentemente bloccato dopo aver completato l&apos;Auto-Type</translation>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>Non richiedere di ripetere la password quando è visibile</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>Nascondere le note della voce per impostazione predefinita</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>Riservatezza</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -216,6 +494,26 @@ Seleziona se vuoi consentire l&apos;accesso.</translation>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annulla</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -289,14 +587,6 @@ Seleziona se vuoi consentire l&apos;accesso.</translation>
         <translation>Ordina le credenziali corrispondenti per nome &amp;utente</translation>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>&amp;Disconnetti tutti i browser</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>Ignora i &amp;permessi precedentemente salvati</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>Avanzate</translation>
     </message>
@@ -362,14 +652,6 @@ Seleziona se vuoi consentire l&apos;accesso.</translation>
         <translation>&lt;b&gt;Avviso:&lt;/b&gt; le seguenti opzioni possono essere pericolose.</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>File eseguibili (*.exe);;Tutti i file (*.*)</translation>
-    </message>
-    <message>
-        <source>Executable Files (*)</source>
-        <translation>File eseguibili (*)</translation>
-    </message>
-    <message>
         <source>Select custom proxy location</source>
         <translation>Selezionare una posizione personalizzata per il proxy</translation>
     </message>
@@ -377,6 +659,31 @@ Seleziona se vuoi consentire l&apos;accesso.</translation>
         <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
         <translation>Siamo spiacenti, ma KeePassXC-Browser non è supportato per i rilasci di Snap al momento.</translation>
     </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation>KeePassXC-Browser è necessario per far funzionare l&apos;integrazione con il browser. &lt; br / &gt; scaricarlo per %1 e %2.</translation>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation>&amp;Tor Browser</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: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation>File eseguibili</translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation>Tutti i file</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"/>
+    </message>
 </context>
 <context>
     <name>BrowserService</name>
@@ -416,153 +723,43 @@ Do you want to overwrite it?</source>
         <translation>Vuoi aggiornare le informazioni in %1 - %2?</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: database bloccato!</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Il database attivo è bloccato!
-Sblocca il database selezionato o scegline un altro che sia sbloccato.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: impostazioni non disponibili!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation>Il database attivo non contiene una voce per le impostazioni.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: nessuna chiave trovata</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation>Nessun chiave condivisa di cifratura è stata trovata nelle impostazioni di KeePassXC.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: chiavi rimosse dal database</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation><numerusform>Rimossa con successo %n chiave di cifratura dalle impostazioni di KeePassXC.</numerusform><numerusform>Rimosse con successo %n chiavi di cifratura dalle impostazioni di KeePassXC.</numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>Rimozione dei permessi salvati...</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>Interrompi</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: permessi rimossi</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation><numerusform>Permessi rimossi con successo da %n voce.</numerusform><numerusform>Permessi rimossi con successo da %n voci.</numerusform></translation>
+        <source>Converting attributes to custom data…</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: nessuna voce con permessi trovata!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Il database attivo non contiene una voce con permessi.</translation>
-    </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>Password</translation>
-    </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>Inserisci password:</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>Ripeti password:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;File chiave</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>Sfoglia</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Crea</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>Risposta di ve&amp;rifica</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Aggiorna</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>File chiave</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>Tutti i file</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>Crea file chiave...</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>Impossibile creare file chiave: </translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>Seleziona un file chiave</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Password vuota</translation>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>Vuoi veramente usare una stringa vuota come password?</translation>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>Sono state inserite password differenti.</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>Impossibile impostare %1 come file chiave:
-%2</translation>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Legacy key file format</source>
-        <translation>Formato di file chiave legacy</translation>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation type="unfinished"/>
     </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>Per il file della chiave, stai utilizzando un formato obsoleto
-che potrebbe non essere più supportato in futuro.
-
-Considera l&apos;opzione di generarne uno nuovo</translation>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>Modifica non riuscita della password principale: nessuna YubiKey inserita.</translation>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -643,14 +840,6 @@ Considera l&apos;opzione di generarne uno nuovo</translation>
         <translation>Non presente nel file CSV</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>Nome campo vuoto </translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>colonna </translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>Importati da file CSV</translation>
     </message>
@@ -659,48 +848,84 @@ Considera l&apos;opzione di generarne uno nuovo</translation>
         <translation>Dati originali: </translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>Errore/i rilevati nel file CSV!</translation>
+        <source>Error</source>
+        <translation>Errore</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation> ulteriori messaggi ignorati]</translation>
+        <source>Empty fieldname %1</source>
+        <translation>Nome di campo vuoto %1</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Errore</translation>
+        <source>column %1</source>
+        <translation>colonna %1</translation>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>Importazione CSV: rilevati errori:
-</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation>Errore(i) rilevati nel file CSV!</translation>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>Errore</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Impossibile calcolare la chiave principale</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
-        <translation><numerusform>%n byte, </numerusform><numerusform>%n byte, </numerusform></translation>
+        <source>%n column(s)</source>
+        <translation><numerusform>%n colonna</numerusform><numerusform>%n colonne</numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation>%1, %2, %3</translation>
     </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
-        <translation><numerusform>%n riga, </numerusform><numerusform>%n righe, </numerusform></translation>
+        <source>%n byte(s)</source>
+        <translation><numerusform>%n byte (s)</numerusform><numerusform>%n byte(s)</numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
-        <translation><numerusform>%n colonna</numerusform><numerusform>%n colonne</numerusform></translation>
+        <source>%n row(s)</source>
+        <translation><numerusform>righe: %n</numerusform><numerusform>%n riga(e)</numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Radice</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>File %1 non esiste.</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Impossibile aprire il file %1.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation>Errore durante la lettura del database: %1</translation>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation>Impossibile salvare, il database non ha nessun nome di file.</translation>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation>Il file non può essere scritto perché aperto in modalità di sola lettura.</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation>Sbloccare Database - KeePassXC</translation>
     </message>
 </context>
 <context>
@@ -730,14 +955,6 @@ Considera l&apos;opzione di generarne uno nuovo</translation>
         <translation>Risposta di verifica:</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Impossibile aprire il database.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Impossibile aprire il file chiave</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation>Formato di file chiave legacy</translation>
     </message>
@@ -767,105 +984,168 @@ Considera l&apos;opzione di generarne uno nuovo</translation>
         <source>Select key file</source>
         <translation>Seleziona file chiave</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>Ripara database</translation>
+        <source>TouchID for quick unlock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Errore</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation>Impossibile aprire il database: %1</translation>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Impossibile aprire il file chiave</translation>
+        <source>Can't open key file:
+%1</source>
+        <translation>Impossibile aprire il file chiave: %1</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Impossibile aprire il database.</translation>
+        <source>Passwords</source>
+        <translation>Password</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Impostazioni avanzate</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Generale</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Database aperto correttamente. Nessuna operazione da eseguire.</translation>
+        <source>Security</source>
+        <translation>Sicurezza</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>Completato</translation>
+        <source>Master Key</source>
+        <translation>Chiave principale</translation>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>Il database è stato correttamente riparato.
-Adesso puoi salvarlo.</translation>
+        <source>Encryption Settings</source>
+        <translation>Impostazioni di crittografia</translation>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>Impossibile riparare il database.</translation>
+        <source>Browser Integration</source>
+        <translation>Integrazione con i browser</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>Generale</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation>Impostazioni di KeePassXC-Browser</translation>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>Cifratura</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>&amp;Disconnetti tutti i browser</translation>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Numero di giri troppo elevato</translation>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation type="unfinished"/>
     </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>Stai utilizzando un numero molto elevato di fasi di trasformazione della chiave con Argon 2
-
-Se continui con questo numero, il tuo database si potrebbe aprire in ore o giorni (o anche più a lungo)</translation>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Understood, keep number</source>
-        <translation>D&apos;accordo, mantieni il valore</translation>
+        <source>Stored keys</source>
+        <translation>Chiavi memorizzate</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>Annulla</translation>
+        <source>Remove</source>
+        <translation>Rimuovi</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Numero di giri troppo basso</translation>
+        <source>Delete the selected key?</source>
+        <translation>Eliminare la chiave selezionata?</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>Stai utilizzando un numero molto basso di fasi di trasformazione della chiave con AES-KDF
-
-Se continui con questo numero, il tuo database potrebbe essere decifrato molto facilmente</translation>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KDF unchanged</source>
-        <translation>KDF invariato</translation>
+        <source>Key</source>
+        <translation>Chiave</translation>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
-        <translation>La trasformazione della chiave con i nuovi parametri KDF e&apos; fallita; KDF immutato</translation>
+        <source>Value</source>
+        <translation>Valore</translation>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation>Scollegare tutti i browser</translation>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: nessuna chiave trovata</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: chiavi rimosse dal database</translation>
     </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
-        <translation><numerusform> MiB</numerusform><numerusform> MiB</numerusform></translation>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Rimozione dei permessi salvati...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Interrompi</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: permessi rimossi</translation>
     </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
-        <translation><numerusform>thread</numerusform><numerusform>thread</numerusform></translation>
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: nessuna voce con permessi trovata!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Il database attivo non contiene una voce con permessi.</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
     </message>
 </context>
 <context>
@@ -902,6 +1182,113 @@ Se continui con questo numero, il tuo database potrebbe essere decifrato molto f
         <source>Parallelism:</source>
         <translation>Parallelismo:</translation>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation>Tempo di de-crittografia:</translation>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation>?? s</translation>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation>Modifica</translation>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation>100 ms</translation>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation>5 s</translation>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation>Formato di database:</translation>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation>KDBX 4.0 (raccomandato)</translation>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation>KDBX 3.1</translation>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation>invariato</translation>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Numero di giri troppo elevato</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>Stai utilizzando un numero molto elevato di fasi di trasformazione della chiave con Argon 2
+
+Se continui con questo numero, il tuo database si potrebbe aprire in ore o giorni (o anche più a lungo)</translation>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation>D&apos;accordo, mantieni il valore</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annulla</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Numero di giri troppo basso</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>Stai utilizzando un numero molto basso di fasi di trasformazione della chiave con AES-KDF
+
+Se continui con questo numero, il tuo database potrebbe essere decifrato molto facilmente</translation>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation>KDF invariato</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation>La trasformazione della chiave con i nuovi parametri KDF e&apos; fallita; KDF immutato</translation>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation><numerusform> MiB</numerusform><numerusform> MiB</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation><numerusform> iscritto (i)</numerusform><numerusform>thread(s)</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation><numerusform>%1 ms</numerusform><numerusform>%1 ms</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -951,91 +1338,110 @@ Se continui con questo numero, il tuo database potrebbe essere decifrato molto f
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>Radice</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Database KeePass 2</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Tutti i file</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Apri database</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>File non trovato!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Impossibile aprire il database.</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>File aperto in modalità di sola lettura.</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
+    <message>
+        <source>Add additional protection...</source>
+        <translation>Aggiungere ulteriore protezione...</translation>
     </message>
     <message>
-        <source>Open CSV file</source>
-        <translation>Apri file CSV</translation>
+        <source>No encryption key added</source>
+        <translation>Nessuna chiave di crittografia aggiunta</translation>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>File CSV</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>Tutti i file (*)</translation>
+        <source>No password set</source>
+        <translation>Nessuna password impostata</translation>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Unisci database</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 type="unfinished"/>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Apri database KeePass 1</translation>
+        <source>Unknown error</source>
+        <translation>Errore sconosciuto</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>Database KeePass 1</translation>
+        <source>Failed to change master key</source>
+        <translation>Modifica della chiave master fallita</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>Close?</source>
-        <translation>Vuoi chiudere?</translation>
+        <source>Database Name:</source>
+        <translation>Nome del database:</translation>
     </message>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; è in modalità modifica.
-Vuoi annullare le modifiche e chiudere comunque?</translation>
+        <source>Description:</source>
+        <translation>Descrizione:</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>Save changes?</source>
-        <translation>Salvare le modifiche?</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Database KeePass 2</translation>
     </message>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>&quot;%1&quot; è stata modificato.
-Vuoi salvare le modifiche?</translation>
+        <source>All files</source>
+        <translation>Tutti i file</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Scrittura database non riuscita.</translation>
+        <source>Open database</source>
+        <translation>Apri database</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Password</translation>
+        <source>CSV file</source>
+        <translation>File CSV</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Salva database come</translation>
+        <source>Merge database</source>
+        <translation>Unisci database</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Apri database KeePass 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>Database KeePass 1</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1046,40 +1452,40 @@ Vuoi salvare le modifiche?</translation>
         <translation>Scrittura file CSV non riuscita.</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>Nuovo database</translation>
+        <source>Database creation error</source>
+        <translation>Errore di creazione del database</translation>
     </message>
     <message>
-        <source>locked</source>
-        <translation>bloccato</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 type="unfinished"/>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>Blocca database</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation>Il file di database non esiste o non è accessibile.</translation>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>Non è possibile bloccare il database dato che lo stai modificando.
-Seleziona &apos;Annulla&apos; per completare le modifiche o scartarle.</translation>
+        <source>Select CSV file</source>
+        <translation>Selezionare il file CSV</translation>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>Questo database è stato modificato.
-Vuoi salvare il database prima di bloccarlo?
-Altrimenti le modifiche verranno perse.</translation>
+        <source>New Database</source>
+        <translation>Nuovo Database</translation>
     </message>
     <message>
-        <source>Disable safe saves?</source>
-        <translation>Disabilita i salvataggi sicuri?</translation>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [nuovo database]</translation>
     </message>
     <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>Nonostante ripetuti tentativi, KeePassXC non è riuscito a salvare il database. Probabilmente la causa risiede in un file di lock bloccato da qualche servizio di sincronizzazione file.
-Disabilitare i salvataggi sicuri e riprovare?</translation>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [bloccato]</translation>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [sola lettura]</translation>
     </message>
 </context>
 <context>
@@ -1089,37 +1495,13 @@ Disabilitare i salvataggi sicuri e riprovare?</translation>
         <translation>Ricerca...</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>Modifica chiave principale</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>Vuoi eliminare la voce?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>Vuoi veramente eliminare la voce &quot;%1&quot;?</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Vuoi eliminare le voci?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Vuoi veramente eliminare %1 voci?</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Vuoi cestinare la voce?</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation>Vuoi davvero cestinare la voce &quot;%1&quot;?</translation>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Vuoi spostare le voci nel Cestino?</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation><numerusform>Vuoi veramente cestinare %n voce?</numerusform><numerusform>Vuoi veramente cestinare %n voci?</numerusform></translation>
@@ -1137,18 +1519,10 @@ Disabilitare i salvataggi sicuri e riprovare?</translation>
         <translation>Ricorda la mia scelta</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Vuoi eliminare il gruppo?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>Vuoi veramente eliminare il gruppo &quot;%1&quot;?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Impossibile calcolare la chiave principale</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>Nessun database attuale.</translation>
     </message>
@@ -1183,10 +1557,6 @@ Do you want to merge your changes?</source>
 Vuoi fondere i cambiamenti?</translation>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>Non è stato possibile aprire il nuovo database mentre si tentava il caricamento automatico di questo database.</translation>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>Svuotare il cestino?</translation>
     </message>
@@ -1194,88 +1564,104 @@ Vuoi fondere i cambiamenti?</translation>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>Sei sicuro di voler eliminare definitivamente tutto dal cestino?</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>Generare un token TOTP</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation><numerusform>Elimina ha?</numerusform><numerusform>Cancellare la voce(i)?</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation><numerusform>Spostare la creazione nel cestino?</numerusform><numerusform>Spostare la voce(i) nel cestino?</numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Chiudi</translation>
+        <source>File opened in read only mode.</source>
+        <translation>File aperto in modalità di sola lettura.</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Generale</translation>
+        <source>Lock Database?</source>
+        <translation>Bloccare il database?</translation>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Password</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot; è stata modificato.
+Vuoi salvare le modifiche?</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>Scadenza</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Nome utente</translation>
+        <source>Save changes?</source>
+        <translation>Salvare le modifiche?</translation>
     </message>
     <message>
-        <source>Autotype</source>
-        <translation>Completamento automatico</translation>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>Ricerca</translation>
+        <source>Disable safe saves?</source>
+        <translation>Disabilita i salvataggi sicuri?</translation>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>Attributi</translation>
+        <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>Nonostante ripetuti tentativi, KeePassXC non è riuscito a salvare il database. Probabilmente la causa risiede in un file di lock bloccato da qualche servizio di sincronizzazione file.
+Disabilitare i salvataggi sicuri e riprovare?</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Allegati</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Note</translation>
+        <source>Passwords</source>
+        <translation>Password</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>Finestra</translation>
+        <source>Save database as</source>
+        <translation>Salva database come</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>Sequenza</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Database KeePass 2</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Cerca</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Azzera</translation>
+        <source>Delete group</source>
+        <translation>Elimina gruppo</translation>
     </message>
     <message>
-        <source>Never</source>
-        <translation>Mai</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[PROTETTO]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>Disabilitato</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Abilitato</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1349,22 +1735,10 @@ Vuoi fondere i cambiamenti?</translation>
         <translation>Nuovo attributo</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Conferma eliminazione</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>Sei sicuro di voler rimuovere questo attributo?</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[PROTETTO]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation>Premere rivela per visualizzare o modificare</translation>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>Domani</translation>
     </message>
@@ -1377,10 +1751,6 @@ Vuoi fondere i cambiamenti?</translation>
         <translation><numerusform>%n mese</numerusform><numerusform>%n mesi</numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>Un anno</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation>Applicare la password generata?</translation>
     </message>
@@ -1392,6 +1762,26 @@ Vuoi fondere i cambiamenti?</translation>
         <source>Entry updated successfully.</source>
         <translation>Voce aggiornata correttamente.</translation>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation>La voce contiene modifiche non salvate</translation>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation>Nuovo attributo %1</translation>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation>[PROTETTO] Seleziona &apos;Rivela&apos; per visualizzare o modificare</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>anno (i) %n</numerusform><numerusform>%n anno(i)</numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1637,6 +2027,81 @@ Vuoi fondere i cambiamenti?</translation>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>Modulo</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Password:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1694,10 +2159,6 @@ Vuoi fondere i cambiamenti?</translation>
         <translation>Impossibile scaricare favicon.</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Suggerimento: è possibile abilitare Google come alternativa in &apos;Strumenti&apos;&gt;&apos;Impostazioni&apos;&gt;&apos;Sicurezza&apos;</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>Immagini</translation>
     </message>
@@ -1706,14 +2167,6 @@ Vuoi fondere i cambiamenti?</translation>
         <translation>Tutti i file</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Seleziona immagine</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read icon</source>
-        <translation>Impossibile leggere l&apos;icona</translation>
-    </message>
-    <message>
         <source>Custom icon already exists</source>
         <translation>L&apos;icona personalizzata esiste già</translation>
     </message>
@@ -1722,8 +2175,36 @@ Vuoi fondere i cambiamenti?</translation>
         <translation>Conferma eliminazione</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>Questa icona viene usata da %1 voce, e sarà sostituita dall&apos;icona predefinita. Sei sicuro di volerla eliminare?</translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation>Icona personalizzata scaricata correttamente</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation>Selezionare immagine(i)</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation>Nessuna icona è stata caricata</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1774,9 +2255,8 @@ Ciò potrebbe causare malfunzionamenti ai plugin interessati.</translation>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation> - Clona</translation>
+        <source>%1 - Clone</source>
+        <translation>%1 - clone</translation>
     </message>
 </context>
 <context>
@@ -1821,10 +2301,6 @@ Ciò potrebbe causare malfunzionamenti ai plugin interessati.</translation>
         <translation><numerusform>Sei sicuro di voler rimuovere %n allegato?</numerusform><numerusform>Sei sicuro di voler rimuovere %n allegati?</numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Conferma eliminazione</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>Salva allegati</translation>
     </message>
@@ -1861,10 +2337,13 @@ Ciò potrebbe causare malfunzionamenti ai plugin interessati.</translation>
 %1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation>Confermare la rimozione</translation>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>Impossibile aprire i file:
-%1</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1948,6 +2427,106 @@ Ciò potrebbe causare malfunzionamenti ai plugin interessati.</translation>
         <source>Attachments</source>
         <translation>Allegati</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>Sì</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>Generare un token TOTP</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Chiudi</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Generale</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Nome utente</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Password</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Scadenza</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>Attributi</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Allegati</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Note</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Completamento automatico</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Finestra</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Sequenza</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Ricerca</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Cerca</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Azzera</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Mai</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[PROTETTO]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Abilitato</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Disabilitato</translation>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EntryView</name>
@@ -1986,6 +2565,19 @@ Ciò potrebbe causare malfunzionamenti ai plugin interessati.</translation>
         <source>Recycle Bin</source>
         <translation>Cestino</translation>
     </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation>[vuoto]</translation>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>HostInstaller</name>
@@ -1999,61 +2591,6 @@ Ciò potrebbe causare malfunzionamenti ai plugin interessati.</translation>
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>Lunghezza:</translation>
-    </message>
-    <message>
-        <source>Character Types</source>
-        <translation>Tipi di carattere</translation>
-    </message>
-    <message>
-        <source>Upper Case Letters</source>
-        <translation>Lettere maiuscole</translation>
-    </message>
-    <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
-    </message>
-    <message>
-        <source>Lower Case Letters</source>
-        <translation>Lettere minuscole</translation>
-    </message>
-    <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
-    </message>
-    <message>
-        <source>Numbers</source>
-        <translation>Numeri</translation>
-    </message>
-    <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
-    </message>
-    <message>
-        <source>Special Characters</source>
-        <translation>Caratteri speciali</translation>
-    </message>
-    <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
-    </message>
-    <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Escludi caratteri simili</translation>
-    </message>
-    <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>Verifica che la password contenga caratteri di ogni gruppo</translation>
-    </message>
-    <message>
-        <source>Extended ASCII</source>
-        <translation>ASCII esteso</translation>
-    </message>
-</context>
-<context>
     <name>KMessageWidget</name>
     <message>
         <source>&amp;Close</source>
@@ -2078,6 +2615,26 @@ Ciò potrebbe causare malfunzionamenti ai plugin interessati.</translation>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Chiave errata o file del database danneggiato.</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation>intestazioni del database mancanti</translation>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>Dimensione dell&apos;id dell&apos;intestazione non valida</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>Lunghezza del campo di intestazione non valida</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>Lunghezza dei dati di intestazione non valida</translation>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2237,10 +2794,6 @@ Ciò potrebbe causare malfunzionamenti ai plugin interessati.</translation>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation>Lunghezza non valida dell&apos;UUID del cifrario</translation>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation>Cifrario non supportato</translation>
     </message>
@@ -2294,6 +2847,18 @@ Si tratta di una migrazione unidirezionale. Non sarà possibile aprire il databa
         <source>Unsupported KeePass 2 database version.</source>
         <translation>Versione di database KeePass 2 non supportata.</translation>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2366,10 +2931,6 @@ Si tratta di una migrazione unidirezionale. Non sarà possibile aprire il databa
         <translation>Elemento della cronistoria con diverso UUID</translation>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation>Impossibile decrittografare la stringa della voce</translation>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation>Trovato attributo personalizzato duplicato</translation>
     </message>
@@ -2418,6 +2979,12 @@ Si tratta di una migrazione unidirezionale. Non sarà possibile aprire il databa
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation>Impossibile decomprimere il binario</translation>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2581,28 +3148,126 @@ Si tratta di una migrazione unidirezionale. Non sarà possibile aprire il databa
         <source>Invalid entry field type</source>
         <translation>Tipo di dato non valido </translation>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>Il file di blocco singola istanza non è valido. Viene eseguita una nuova istanza.</translation>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>Il file di blocco non può essere creato. La modalità a istanza singola è disattivata.</translation>
+        <source>Import from</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>È già in esecuzione un&apos;altra istanza di KeePassXC.</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Errore fatale durante il test delle funzioni di crittografia.</translation>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Errore</translation>
+        <source>Key Component</source>
+        <translation>Componente chiave</translation>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation>Descrizione del componente chiave</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annulla</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation>Aggiungere %1</translation>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation>Modificare %1</translation>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation>Rimuovere %1</translation>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>Sfoglia</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Genera</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation>File chiave</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"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation>Formato di file chiave legacy</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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>File chiave</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Tutti i file</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Crea file chiave...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation>Errore nella creazione del file chiave</translation>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Seleziona un file chiave</translation>
     </message>
 </context>
 <context>
@@ -2616,10 +3281,6 @@ Si tratta di una migrazione unidirezionale. Non sarà possibile aprire il databa
         <translation>&amp;Database recenti</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Importazione</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation>&amp;Aiuto</translation>
     </message>
@@ -2628,14 +3289,6 @@ Si tratta di una migrazione unidirezionale. Non sarà possibile aprire il databa
         <translation>&amp;Voci</translation>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>Copia gli att&amp;ributi negli appunti</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation>Password monouso a tempo</translation>
-    </message>
-    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Gruppi</translation>
     </message>
@@ -2664,30 +3317,10 @@ Si tratta di una migrazione unidirezionale. Non sarà possibile aprire il databa
         <translation>&amp;Chiudi database</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>&amp;Nuovo database</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>Unisci da database KeePassX</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>&amp;Aggiungi nuova voce</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>&amp;Visualizza/modifica voce</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>&amp;Elimina voce</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>&amp;Aggiungi nuovo gruppo</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>&amp;Modifica gruppo</translation>
     </message>
@@ -2700,14 +3333,6 @@ Si tratta di una migrazione unidirezionale. Non sarà possibile aprire il databa
         <translation>Sal&amp;va database come...</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>&amp;Modifica chiave principale...</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>Impostazioni &amp;database</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>Impostazioni database</translation>
     </message>
@@ -2716,10 +3341,6 @@ Si tratta di una migrazione unidirezionale. Non sarà possibile aprire il databa
         <translation>&amp;Clona voce</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>&amp;Trova</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>Copia &amp;nome utente</translation>
     </message>
@@ -2728,10 +3349,6 @@ Si tratta di una migrazione unidirezionale. Non sarà possibile aprire il databa
         <translation>Copia nome utente negli appunti</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>Copi&amp;a password</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>Copia password negli appunti</translation>
     </message>
@@ -2744,14 +3361,6 @@ Si tratta di una migrazione unidirezionale. Non sarà possibile aprire il databa
         <translation>Genera password</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation>&amp;Esegui completamento automatico</translation>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>&amp;Apri URL</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>&amp;Blocca database</translation>
     </message>
@@ -2784,22 +3393,6 @@ Si tratta di una migrazione unidirezionale. Non sarà possibile aprire il databa
         <translation>&amp;Esporta in file CSV...</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Importa database di KeePass 1...</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>Importa file CSV...</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Ri&amp;para database...</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>Visualizza TOTP</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>Imposta TOTP...</translation>
     </message>
@@ -2820,14 +3413,6 @@ Si tratta di una migrazione unidirezionale. Non sarà possibile aprire il databa
         <translation>Errore di accesso per il file di configurazione %1</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Sembra che per l&apos;integrazione con il browser tu stia utilizzando KeePassHTTP. Questa funzionalità è dichiarata obsoleta e verrà rimossa in un prossimo futuro.&lt;br&gt;Si consiglia di utilizzare KeePassXC-Browser piuttosto! Se hai bisogno di aiuto per effettuare la migrazione, visita la nostra &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;guida alla migrazione&lt;/a&gt; (avviso %1 di 3).&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>sola lettura</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Impostazioni</translation>
     </message>
@@ -2840,36 +3425,278 @@ Si tratta di una migrazione unidirezionale. Non sarà possibile aprire il databa
         <translation>Esci da KeePassXC</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Database KeePass 2</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Premi il pulsante della YubiKey!</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Tutti i file</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation>ATTENZIONE: stai utilizzando una versione non stabile di KeePassXC!
+Vi è il rischio concreto di danneggiamenti ai database utilizzati, si consiglia di predisporre per una loro copia di sicurezza.
+Questa versione non è pensata per essere utilizzata in ambito di produzione.</translation>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Apri database</translation>
+        <source>&amp;Donate</source>
+        <translation>&amp;Donare</translation>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Salva database riparato</translation>
+        <source>Report a &amp;bug</source>
+        <translation>Segnala un &amp;bug</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Scrittura database non riuscita.</translation>
+        <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>AVVISO: la tua versione di Qt può causare dei crash di KeePassXC con una tastiera sullo schermo!
+Si consiglia di utilizzare l&apos;AppImage disponibile sulla nostra pagina di download.</translation>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Premi il pulsante della YubiKey!</translation>
+        <source>&amp;Import</source>
+        <translation>&amp;Importare</translation>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
-        <translation>ATTENZIONE: stai utilizzando una versione non stabile di KeePassXC!
-Vi è il rischio concreto di danneggiamenti ai database utilizzati, si consiglia di predisporre per una loro copia di sicurezza.
-Questa versione non è pensata per essere utilizzata in ambito di produzione.</translation>
+        <source>Copy att&amp;ribute...</source>
+        <translation>Copia att&amp;ributo...</translation>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation>TOTP...</translation>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation>&amp;Nuovo database...</translation>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation>Creare un nuovo database</translation>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation>&amp;Unire dal database...</translation>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation>Unire da un altro database KDBX</translation>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation>&amp;Nuova voce</translation>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation>Aggiungere una nuova voce</translation>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation>&amp;Modificare voce</translation>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation>Visualizzare o modificare voce</translation>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation>&amp;Nuovo gruppo</translation>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation>Aggiungere un nuovo gruppo</translation>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation>Cambiare la &amp;chiave principale...</translation>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation>Impostazioni del &amp;Database...</translation>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation>Copia &amp;password</translation>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation>Eseguire compilazione &amp;automatica</translation>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation>Aprire &amp;URL</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation>KeePass 1 database...</translation>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation>Importare un database KeePass 1</translation>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation>File CSV...</translation>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation>Importare un file CSV</translation>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation>Visualizza TOTP...</translation>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation>Mostra codice QR TOTP...</translation>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Radice</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>Pagina della procedura guidata</translation>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Impostazioni avanzate</translation>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation>Impostazioni semplici</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <translation>Impostazioni di crittografia</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 type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation>Chiave principale del database</translation>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <translation>Informazioni generali sul database</translation>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation>Si prega di compilare il nome visualizzato e una descrizione facoltativa per il nuovo database:</translation>
     </message>
 </context>
 <context>
@@ -2972,125 +3799,34 @@ Questa versione non è pensata per essere utilizzata in ambito di produzione.</t
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>Dialog</source>
-        <translation>Finestra</translation>
-    </message>
-    <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>Questo è necessario per accedere ai database da ChromeIPass o PassIFox</translation>
-    </message>
-    <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>Atttiva il server KeePassHTTP</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Generale</translation>
-    </message>
-    <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>Visualizza una n&amp;otifica quando sono richieste le credenziali</translation>
-    </message>
-    <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>Restituisci solo le corrispondenze migliori per un&apos;URL specifica invece di tutte le voci per l&apos;intero dominio.</translation>
-    </message>
-    <message>
-        <source>&amp;Return only best matching entries</source>
-        <translation>&amp;Restituisci solo le corrispondenti migliori</translation>
-    </message>
-    <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Ri&amp;chiedi di sbloccare il database se bloccato</translation>
-    </message>
-    <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation>Solo le voci con lo stesso schema (http://, https://, ftp: //, ...) vengono restituite.</translation>
-    </message>
-    <message>
-        <source>&amp;Match URL schemes</source>
-        <translation>Corrispondenza sche&amp;mi URL</translation>
-    </message>
-    <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Ordina voci trovate per nome &amp;utente</translation>
-    </message>
-    <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Ordina le voci per &amp;titolo</translation>
-    </message>
-    <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>R&amp;imuovi tutte le chiavi condivise di cifratura dal database attivo</translation>
-    </message>
-    <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>R&amp;imuovi tutti i permessi presenti nelle voci nel database attivo</translation>
-    </message>
-    <message>
-        <source>Password Generator</source>
-        <translation>Genera password</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Avanzate</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Permetti sempre di &amp;accedere alle voci</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Permetti sempre di &amp;aggiornare le voci</translation>
-    </message>
-    <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>Solo il database selezionato deve essere collegato con un client.</translation>
-    </message>
-    <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Cerc&amp;a in tutti i database aperti le voci corrispondenti</translation>
-    </message>
-    <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>La creazione o l&apos;aggiornamento automatico dei campi stringa non è supportato.</translation>
-    </message>
-    <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>&amp;Seleziona i campi stringa avanzati che iniziano con &quot;KPH: &quot;</translation>
-    </message>
-    <message>
-        <source>HTTP Port:</source>
-        <translation>Porta HTTP:</translation>
+        <source>Enter password:</source>
+        <translation>Inserisci password:</translation>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Porta predefinita: 19455</translation>
+        <source>Confirm password:</source>
+        <translation>Conferma password:</translation>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC rimarrà in ascolto su questa porta su 127.0.0.1</translation>
+        <source>Password</source>
+        <translation>Password</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;Avviso:&lt;/b&gt; le seguenti opzioni possono essere pericolose.</translation>
+        <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"/>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;KeePassHTTP è dichiarato obsoleto e verrà rimosso in un prossimo futuro.&lt;br&gt;Si consiglia di utilizzare KeePassXC-Browser piuttosto! Se hai bisogno di aiuto per effettuare la migrazione, visita la nostra &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;guida alla migrazione&lt;/a&gt;.&lt;/p&gt;</translation>
+        <source>Password cannot be empty.</source>
+        <translation>La password non può essere vuota.</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Non è stato possibile collegarsi ad una porta privilegiata</translation>
+        <source>Passwords do not match.</source>
+        <translation>Le password non corrispondono.</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Non è possibile usare porte sotto la 1024!
-Viene usata la porta predefinita 19455.</translation>
+        <source>Generate master password</source>
+        <translation>Generare la password principale</translation>
     </message>
 </context>
 <context>
@@ -3161,18 +3897,10 @@ Viene usata la porta predefinita 19455.</translation>
         <translation>Elenco termini:</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Conteggio parole:</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>Separatore parole:</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>Genera</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
@@ -3185,10 +3913,6 @@ Viene usata la porta predefinita 19455.</translation>
         <translation>Chiudi</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>Applica</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>Entropia: %1 bit</translation>
     </message>
@@ -3216,6 +3940,171 @@ Viene usata la porta predefinita 19455.</translation>
         <comment>Password quality</comment>
         <translation>Eccellente</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation>ASCII esteso</translation>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation>Passare alla modalità avanzata</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Avanzate</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation>Lettere maiuscole dalla A alla F</translation>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation>Lettere maiuscole dalla A alla F</translation>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation>Parentesi graffe</translation>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation>Punteggiatura</translation>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation>Citazioni</translation>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation>Matematica</translation>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation>Trattini</translation>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation>Logogrammi</translation>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation>Passare alla modalità semplice</translation>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation>Semplice</translation>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation>Set di caratteri da escludere dalla password generata</translation>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation>Non includere:</translation>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation>Hex</translation>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation>Escludere i caratteri: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</translation>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation>Conte&amp;ggio delle parole:</translation>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation>Rigenerare</translation>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Elimina</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Rimuovi</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Disabilita</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3236,34 +4125,18 @@ Viene usata la porta predefinita 19455.</translation>
         <translation>Impossibile decrittografare il messaggio</translation>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
-        <translation>Tempo scaduto o impossibile collegarsi a KeePassXC</translation>
-    </message>
-    <message>
         <source>Action cancelled or denied</source>
         <translation>Azione annullata o negata</translation>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation>Impossibile cifrare il messaggio o chiave pubblica non trovata. La messaggistica nativa è abilitata in KeePassXC?</translation>
-    </message>
-    <message>
         <source>KeePassXC association failed, try again</source>
         <translation>Associazione KeePassXC fallita, riprova</translation>
     </message>
     <message>
-        <source>Key change was not successful</source>
-        <translation>Il cambiamento chiave non ha avuto successo</translation>
-    </message>
-    <message>
         <source>Encryption key is not recognized</source>
         <translation>Chiave di crittografia non riconosciuta</translation>
     </message>
     <message>
-        <source>No saved databases found</source>
-        <translation>Nessun database salvato trovato</translation>
-    </message>
-    <message>
         <source>Incorrect action</source>
         <translation>Azione non corretta</translation>
     </message>
@@ -3389,10 +4262,6 @@ Viene usata la porta predefinita 19455.</translation>
         <translation>Inserisci la password per sbloccare %1:</translation>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation>Impossibile caricare il file chiave %1: %2</translation>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3477,12 +4346,6 @@ Comandi disponibili:
         <translation>errore di lettura dal dispositivo</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>file vuoto!
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation>stringa non valida</translation>
     </message>
@@ -3491,30 +4354,6 @@ Comandi disponibili:
         <translation>virgoletta di chiusura mancante</translation>
     </message>
     <message>
-        <source>AES: 256-bit</source>
-        <translation>AES: 256 bit</translation>
-    </message>
-    <message>
-        <source>Twofish: 256-bit</source>
-        <translation>Twofish: 256 bit</translation>
-    </message>
-    <message>
-        <source>ChaCha20: 256-bit</source>
-        <translation>ChaCha20: 256 bit</translation>
-    </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – raccomandato)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 4)</source>
-        <translation>AES-KDF (KDBX 4)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 3.1)</source>
-        <translation>AES-KDF (KDBX 3.1)</translation>
-    </message>
-    <message>
         <source>Group</source>
         <translation>Gruppo</translation>
     </message>
@@ -3543,10 +4382,6 @@ Comandi disponibili:
         <translation>Creazione</translation>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
-        <translation>Integrazione del browser legacy</translation>
-    </message>
-    <message>
         <source>Browser Integration</source>
         <translation>Integrazione con i browser</translation>
     </message>
@@ -3575,10 +4410,6 @@ Comandi disponibili:
         <translation>Numero di parole per la passphrase con lancio dei dadi</translation>
     </message>
     <message>
-        <source>count</source>
-        <translation>conteggio</translation>
-    </message>
-    <message>
         <source>Wordlist for the diceware generator.
 [Default: EFF English]</source>
         <translation>Lista di parole per il generatore con lancio di dadi.
@@ -3589,28 +4420,438 @@ Comandi disponibili:
         <translation>Genera una nuova password casuale.</translation>
     </message>
     <message>
-        <source>Length of the generated password.</source>
-        <translation>Lunghezza della password generata.</translation>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation>Immettere la password per la nuova voce: </translation>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation>Scrittura del database non riuscita %1.</translation>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation>Aggiunta con successo la voce %1.</translation>
+    </message>
+    <message>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation>Copiare il TOTP corrente negli appunti.</translation>
+    </message>
+    <message>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation>Appunti cancellati!</translation>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation>Silenziare la richiesta di password e altri output secondari.</translation>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation>conteggio</translation>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation>Immettere la nuova password per la voce: </translation>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation>Lunghezza %1</translation>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation>Entropia %1</translation>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation>Log10 %1</translation>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation>Multi-parola extra bit %1</translation>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation>Tipo: Bruteforce</translation>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation>Tipo: dizionario</translation>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation>Tipo: parole utente</translation>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation>Tipo: ripetute</translation>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation>Tipo: sequenza</translation>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation>Tipo: spaziale</translation>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation>Tipo: data</translation>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation>Tipo: Bruteforce(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation>Tipo: dizionario(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation>Tipo: Sconosciuto %1</translation>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation>Entropia %1 (%2)</translation>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>File %1 non esiste.</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Impossibile aprire il file %1.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation>Lunghezza della password generata</translation>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation>Utilizzare caratteri minuscoli</translation>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation>Utilizzare caratteri maiuscoli</translation>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation>Utilizzare i numeri.</translation>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation>Utilizzare caratteri speciali</translation>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation>Usare ASCII esteso</translation>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation>Escludere il set di caratteri</translation>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation>chars</translation>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation>Escludere i caratteri dall&apos;aspetto simile</translation>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation>Includere i caratteri da ogni gruppo selezionato</translation>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation>Elencare gli elementi del gruppo in modo ricorsivo.</translation>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation>Impossibile trovare il gruppo %1.</translation>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
-        <translation>Includi lettere minuscole nella password generata.</translation>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
-        <translation>Includi lettere maiuscole nella password generata.</translation>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
-        <translation>Includi numeri nella password generata.</translation>
+        <source>file empty</source>
+        <translation>file vuoto</translation>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
-        <translation>Includi caratteri speciali nella password generata.</translation>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256 bit</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256 bit</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256 bit</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – raccomandato)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
-        <translation>Includi caratteri ASCII estesi nella password generata.</translation>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation>Impostazioni non valide</translation>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation>Chiave non valida</translation>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>Rimuovi una voce dal database.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>Percorso della voce da rimuovere.</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>Il file di blocco singola istanza non è valido. Viene eseguita una nuova istanza.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Il file di blocco non può essere creato. La modalità a istanza singola è disattivata.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - gestore di password multipiattaforma</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>i nomi dei file di database delle password da aprire (*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>percorso ad un file di configurazione personalizzato</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>file chiave del database</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>leggi la password del database da stdin</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation>Riferimento alla finestra padre</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>È già in esecuzione un&apos;altra istanza di KeePassXC.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Errore fatale durante il test delle funzioni di crittografia.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Errore</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation>Password del database: </translation>
     </message>
 </context>
 <context>
@@ -3648,12 +4889,98 @@ Comandi disponibili:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
     <message>
-        <source>Search...</source>
-        <translation>Ricerca...</translation>
+        <source>Agent connection failed.</source>
+        <translation>Connessione con l&apos;agente non riuscita.</translation>
     </message>
     <message>
+        <source>Agent protocol error.</source>
+        <translation>Errore di protocollo dell&apos;agente.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation>Nessun agente in esecuzione, impossibile aggiungere un&apos;identità.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation>Nessun agente in esecuzione, non è possibile rimuovere l&apos;identità.</translation>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation>L&apos;agente ha rifiutato questa identità. Motivi possibili sono:</translation>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation>La chiave è già stata aggiunta.</translation>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation>Durata limitata non è supportata dall&apos;agente (controllare le opzioni).</translation>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation>Una richiesta di conferma non è supportata dall&apos;agente (controllare le opzioni).</translation>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation>Cercare nell&apos;aiuto</translation>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation>Modificatori</translation>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation>Escludere il termine dai risultati</translation>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation>Corrispondenza esatta dei termini</translation>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation>utilizzare regex nel termine</translation>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation>Campi</translation>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation>corrispondenza con qualsiasi cosa</translation>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation>corrisponde a uno</translation>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation>OR logico</translation>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation>Esempi</translation>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
         <source>Search</source>
         <translation>Cerca</translation>
     </message>
@@ -3662,314 +4989,316 @@ Comandi disponibili:
         <translation>Azzera</translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Distingui maiuscole</translation>
-    </message>
-    <message>
         <source>Limit search to selected group</source>
         <translation>Limita la ricerca al gruppo selezionato</translation>
     </message>
+    <message>
+        <source>Search Help</source>
+        <translation>Cercare nell&apos;aiuto</translation>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation>Ricerca (%1)...</translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation>Riconoscimento di maiuscole e minuscole</translation>
+    </message>
 </context>
 <context>
-    <name>Service</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC: nuova richiesta di associazione chiave</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation>Hai ricevuto una richiesta di associazione per la chiave sovrastante.
-Se vuoi permetterle di accedere al database KeePassXC
-imposta un nome unico per identificarla ed accettarla.</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: Vuoi sovrascrivere la chiave esistente?</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Una chiave di cifratura condivisa con il nome &quot;%1&quot; esiste già.
-Vuoi sovrascriverla?</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: aggiorna voce</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Vuoi aggiornare le informazioni in %1 - %2?</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: database bloccato!</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Il database attivo è bloccato!
-Sblocca il database selezionato o scegline un altro che sia sbloccato.</translation>
+        <source>Key:</source>
+        <translation>Chiave:</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: chiavi rimosse dal database</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation><numerusform>Rimossa con successo %n chiave di cifratura dalle impostazioni di KeePassX/Http.</numerusform><numerusform>Rimosse con successo %n chiavi di cifratura dalle impostazioni di KeePassX/Http.</numerusform></translation>
+        <source>Generate</source>
+        <translation>Genera</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: nessuna chiave trovata</translation>
+        <source>Import</source>
+        <translation>Importazione</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>Nessun chiave condivisa di cifratura è stata trovata nelle impostazioni di KeePassHttp.</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: impostazioni non disponibili!</translation>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>Il database attivo non contiene nessun voce delle impostazioni di KeePassHttp.</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>Rimozione dei permessi salvati...</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>Interrompi</translation>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: permessi rimossi</translation>
+        <source>Remove</source>
+        <translation>Rimuovi</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation><numerusform>Permessi rimossi con successo da %n voce.</numerusform><numerusform>Permessi rimossi con successo da %n voci.</numerusform></translation>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: nessuna voce con permessi trovata!</translation>
+        <source>Status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Il database attivo non contiene una voce con permessi.</translation>
+        <source>Fingerprint</source>
+        <translation>Impronta digitale</translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
-        <translation>Impostazioni applicazione</translation>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Generale</translation>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>Sicurezza</translation>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>Errore di accesso per il file di configurazione %1</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>Impostazioni di base</translation>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Avvia una sola istanza di KeePassXC</translation>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>Ricorda ultimo database</translation>
+        <source>All files</source>
+        <translation>Tutti i file</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Ricorda gli ultimi file chiave e dongle di sicurezza</translation>
+        <source>Select path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Carica i database precedenti all&apos;avvio</translation>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>Salva automaticamente all&apos;uscita</translation>
+        <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"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>Salva automaticamente dopo ogni modifica</translation>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Ricarica automaticamente il database quando ci sono modifiche esterne</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>Minimizza quando si copia negli appunti</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Minimizza la finestra all&apos;avvio della applicazione</translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>Usa icona del gruppo alla creazione di una voce</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Non contrassegnare il database come modificato per modifiche non riguardanti i dati (ad es. espansione dei gruppi)</translation>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
-        <translation>Nascondere la vista dei dettagli</translation>
+        <source>Never</source>
+        <translation>Mai</translation>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>Visualizza un&apos;icona nell&apos;area di notifica di sistema</translation>
+        <source>Always</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>Nascondi la finestra nell&apos;area di notifica di sistema quando viene minimizzata</translation>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
-        <translation>Nascondi la finestra nell&apos;area di notifica di sistema invece di chiudere l&apos;applicazione</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
-        <translation>Icona scura per l&apos;area di notifica di sistema</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Lingua</translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Completamento automatico</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>Usa il titolo della voce per la corrispondenza con le finestre per il completamento automatico globale</translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>Usa URL della voce per la corrispondenza con le finestre per il completamento automatico globale</translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation>Chiedi sempre prima di effettuare il completamento automatico</translation>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Scorciatoia globale per l&apos;auto-completamento</translation>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>Ritardo completamento automatico</translation>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation> ms</translation>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
-        <translation>Avvio</translation>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
-        <translation>Gestione dei file</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation>Salvataggio sicuro dei file di database (potrebbe essere incompatibile con Dropbox, ecc)</translation>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
-        <translation>Effettua una copia di sicurezza del database prima di salvarlo</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
-        <translation>Gestione dell&apos;elemento</translation>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Generale</translation>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
-        <translation>Timeout</translation>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>Svuota gli appunti dopo</translation>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> sec</translation>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>Blocca i database dopo un&apos;inattività di</translation>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Comodità</translation>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Blocca i database quando la sessione è bloccata o il coperchio è chiuso</translation>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>Blocca il database dopo la minimizzazione della finestra</translation>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>TotpDialog</name>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>Non richiedere di ripetere la password quando è visibile</translation>
+        <source>Timed Password</source>
+        <translation>Password temporizzata</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Visualizza la password in chiaro in maniera predefinita</translation>
+        <source>000000</source>
+        <translation>000000</translation>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
-        <translation>Nascondere le password nel pannello di anteprima</translation>
+        <source>Copy</source>
+        <translation>Copia</translation>
+    </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
     <message>
-        <source>Hide entry notes by default</source>
-        <translation>Nascondere le note della voce per impostazione predefinita</translation>
+        <source>Copy</source>
+        <translation>Copia</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>Riservatezza</translation>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>Usa Google come alternativa per scaricare le icone dal sito web</translation>
+        <source>There was an error creating the QR code.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
-        <translation>Blocca nuovamente un database precedentemente bloccato dopo aver completato l&apos;Auto-Type</translation>
+        <source>Closing in %1 seconds.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation>Imposta TOTP</translation>
@@ -3984,66 +5313,91 @@ Sblocca il database selezionato o scegline un altro che sia sbloccato.</translat
     </message>
     <message>
         <source>Steam token settings</source>
-        <translation>Impostazioni del token di vapore</translation>
+        <translation>Impostazioni del token di Steam</translation>
     </message>
     <message>
         <source>Use custom settings</source>
         <translation>Usa le impostazioni personalizzate</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>Nota: modifica queste impostazioni solo se sai quello che stai facendo.</translation>
+        <source>Custom Settings</source>
+        <translation>Impostazioni personalizzate</translation>
     </message>
     <message>
         <source>Time step:</source>
         <translation>Passo temporale:</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8 cifre</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> sec</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>Dimensioni codice:</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6 cifre</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>Dimensioni codice:</translation>
+        <source>7 digits</source>
+        <translation>7 cifre</translation>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> sec</translation>
+        <source>8 digits</source>
+        <translation>8 cifre</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>Password temporizzata</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Copia</translation>
+        <source>Close</source>
+        <translation>Chiudi</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>Scade tra</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>secondi</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>Sblocca database</translation>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4078,42 +5432,26 @@ Sblocca il database selezionato o scegline un altro che sia sbloccato.</translat
     </message>
 </context>
 <context>
-    <name>main</name>
-    <message>
-        <source>Remove an entry from the database.</source>
-        <translation>Rimuovi una voce dal database.</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>Percorso del database.</translation>
-    </message>
-    <message>
-        <source>Path of the entry to remove.</source>
-        <translation>Percorso della voce da rimuovere.</translation>
-    </message>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - gestore di password multipiattaforma</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>i nomi dei file di database delle password da aprire (*.kdbx)</translation>
+        <source>Refresh</source>
+        <translation>Aggiorna</translation>
     </message>
     <message>
-        <source>path to a custom config file</source>
-        <translation>percorso ad un file di configurazione personalizzato</translation>
+        <source>YubiKey Challenge-Response</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>file chiave del database</translation>
+        <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"/>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>leggi la password del database da stdin</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Parent window handle</source>
-        <translation>Riferimento alla finestra padre</translation>
+        <source>No YubiKey inserted.</source>
+        <translation>Nessun YubiKey inserito.</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 a54aaa06b..8952456db 100644
--- a/share/translations/keepassx_ja.ts
+++ b/share/translations/keepassx_ja.ts
@@ -38,12 +38,6 @@
         <translation>クリップボードにコピー</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>バージョン %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>リビジョン: %1</translation>
     </message>
@@ -76,35 +70,48 @@ CPU アーキテクチャー: %2
         <translation>KeePassXC チームはオリジナルの KeePassX を作成した debfx に心から感謝します。</translation>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
-        <translation>ビルド形式: %1
-</translation>
+        <source>Version %1</source>
+        <translation>バージョン %1</translation>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP アクセス確認</translation>
+        <source>Build Type: %1</source>
+        <translation>ビルド形式: %1</translation>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>この決定を記憶する</translation>
+        <source>Auto-Type</source>
+        <translation>自動入力</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>許可</translation>
+        <source>Browser Integration</source>
+        <translation>ブラウザー統合</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>拒否</translation>
+        <source>SSH Agent</source>
+        <translation>SSH エージェント</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>%1 が以下の項目のパスワードへのアクセスを要求しました。
-アクセスを許可するかどうかを選択してください。</translation>
+        <source>YubiKey</source>
+        <translation>YubiKey</translation>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation>TouchID</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>なし</translation>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -113,12 +120,283 @@ Please select whether you want to allow access.</source>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>SSH エージェントを有効にする (再起動が必要)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>アプリケーション設定</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>一般</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>セキュリティ</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>設定ファイル %1 へのアクセスエラー</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>基本設定</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>起動</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>KeePassXC のインスタンスを一つだけ起動する</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>最近使用したデータベースを記憶する</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>最近使用したキーファイルとセキュリティドングルを記憶する</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>起動時に前回のデータベースを読み込む</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>アプリケーション起動時にウィンドウを最小化する</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>ファイル管理</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation>安全にデータベースファイルを保存する (Dropbox などのサービスでは動作しない可能性があります)</translation>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation>保存する前にデータベースファイルをバックアップする</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>変更するたびに自動的に保存する</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>終了時に自動的に保存する</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>データ以外の変更 (例えばグループの展開) に対して、データベースを修正済みとしてマークしないようにする</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>編集された際に自動でデータベースを再読み込みする</translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>エントリー管理</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>エントリー作成時にグループのアイコンを使用する</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>クリップボードにコピーしたら最小化する</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation>エントリーのプレビューパネルを非表示にする</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>一般</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation>ツールバー (アイコン) を非表示にする</translation>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation>アプリケーション終了ではなく最小化する</translation>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>システムトレイアイコンを表示する</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>ダークシステムトレイアイコン</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>最小化された際にシステムトレイへ格納する</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>言語</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>自動入力</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>グローバル自動入力のウィンドウ照合にエントリーのタイトルを使用する</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>グローバル自動入力のウィンドウ照合にエントリーの URL を使用する</translation>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>自動入力を行う前に毎回確認する</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>グローバル自動入力のショートカット</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation>自動入力の入力時の遅延</translation>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation>ミリ秒</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation>自動入力開始までの遅延</translation>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>タイムアウト</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>次の時間が過ぎたらクリップボードを消去する</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>秒</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>未操作の時間が続いたらデータベースをロックする</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation> 分</translation>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation>未操作の時間が続いたら TouchID を消去する</translation>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>利便性</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>セッションがロックされたりラップトップが閉じられた際にデータベースをロックする</translation>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation>セッションがロックされたりラップトップが閉じられた際に TouchID を消去する</translation>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>ウィンドウを最小化したらデータベースをロックする</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation>自動入力実行後に以前ロックされたデータベースを再ロックする</translation>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>パスワードが表示されている場合は、パスワードの再入力を必要としないようにする</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation>編集時にパスワードを非表示にしない</translation>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation>空のパスワードフィールドでプレースホルダーを使用しない</translation>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation>エントリーのプレビューパネルのパスワードを非表示にする</translation>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>エントリーのメモをデフォルトで非表示にする</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>プライバシー</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation>ウェブサイトのアイコンをダウンロードするためのフォールバックとして DuckDuckGo を使用する</translation>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
     <message>
         <source>Couldn&apos;t find an entry that matches the window title:</source>
-        <translation>ウィンドウタイトルにマッチするエントリーが見つかりませんでした:</translation>
+        <translation>ウィンドウタイトルに一致するエントリーが見つかりませんでした:</translation>
     </message>
     <message>
         <source>Auto-Type - KeePassXC</source>
@@ -216,6 +494,27 @@ Please select whether you want to allow access.</source>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation>KeePassXC-Browser エントリーを保存</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>キャンセル</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation>複数のデータベースを開いています。
+資格情報を保存する正しいデータベースを選択してください。</translation>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -256,7 +555,7 @@ Please select whether you want to allow access.</source>
     <message>
         <source>Show a &amp;notification when credentials are requested</source>
         <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>クレデンシャルを要求された際に通知を表示する(&amp;N)</translation>
+        <translation>資格情報を要求された際に通知を表示する(&amp;N)</translation>
     </message>
     <message>
         <source>Re&amp;quest to unlock the database if it is locked</source>
@@ -268,33 +567,25 @@ Please select whether you want to allow access.</source>
     </message>
     <message>
         <source>&amp;Match URL scheme (e.g., https://...)</source>
-        <translation>URL スキーム (例えば https://...) のマッチ(&amp;M)</translation>
+        <translation>URL スキーム (例えば https://...) の一致(&amp;M)</translation>
     </message>
     <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>ドメイン全体にマッチする全てのエントリーの代わりに、特定の URL に最もマッチするエントリーのみが返されます。</translation>
+        <translation>ドメイン全体に一致する全てのエントリーの代わりに、特定の URL に最も一致するエントリーのみが返されます。</translation>
     </message>
     <message>
         <source>&amp;Return only best-matching credentials</source>
-        <translation>最もマッチするクレデンシャルのみを返す(&amp;R)</translation>
+        <translation>最も一致する資格情報のみを返す(&amp;R)</translation>
     </message>
     <message>
         <source>Sort &amp;matching credentials by title</source>
         <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>マッチするクレデンシャルをタイトルで並べ替える(&amp;M)</translation>
+        <translation>一致する資格情報をタイトルで並べ替える(&amp;M)</translation>
     </message>
     <message>
         <source>Sort matching credentials by &amp;username</source>
         <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>マッチするクレデンシャルをユーザー名で並べ替える(&amp;U)</translation>
-    </message>
-    <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>全てのブラウザーの接続を断つ(&amp;D)</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>記憶された全てのアクセス許可を破棄する(&amp;P)</translation>
+        <translation>一致する資格情報をユーザー名で並べ替える(&amp;U)</translation>
     </message>
     <message>
         <source>Advanced</source>
@@ -303,12 +594,12 @@ Please select whether you want to allow access.</source>
     <message>
         <source>Never &amp;ask before accessing credentials</source>
         <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>クレデンシャルにアクセスする前に確認しない(&amp;A)</translation>
+        <translation>資格情報にアクセスする前に確認しない(&amp;A)</translation>
     </message>
     <message>
         <source>Never ask before &amp;updating credentials</source>
         <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>クレデンシャルを更新する前に確認しない(&amp;U)</translation>
+        <translation>資格情報を更新する前に確認しない(&amp;U)</translation>
     </message>
     <message>
         <source>Only the selected database has to be connected with a client.</source>
@@ -317,7 +608,7 @@ Please select whether you want to allow access.</source>
     <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;H)</translation>
+        <translation>全ての開かれたデータベースから一致する資格情報を検索する(&amp;H)</translation>
     </message>
     <message>
         <source>Automatically creating or updating string fields is not supported.</source>
@@ -362,14 +653,6 @@ Please select whether you want to allow access.</source>
         <translation>&lt;b&gt;警告:&lt;/b&gt; 以下は危険なオプションです。</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>実行ファイル (*.exe);;全てのファイル (*.*)</translation>
-    </message>
-    <message>
-        <source>Executable Files (*)</source>
-        <translation>実行ファイル (*)</translation>
-    </message>
-    <message>
         <source>Select custom proxy location</source>
         <translation>カスタムプロキシを選択する</translation>
     </message>
@@ -377,6 +660,31 @@ Please select whether you want to allow access.</source>
         <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
         <translation>申し訳ありませんが、今の所 KeePassXC-Browser は Snap リリースではサポートしていません。</translation>
     </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation>ブラウザー統合の動作には KeePassXC-Browser が必要です。&lt;br /&gt;KeePassXC-Browser は %1 用と %2 用の2種類あります。</translation>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation>Tor Browser(&amp;T)</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: </source>
+        <translation>&lt;b&gt;[警告]&lt;/b&gt; keepassxc-proxy アプリケーションが見つかりませんでした。&lt;br /&gt;KeePassXC のインストールディレクトリや、詳細設定でカスタムパスを確認してください。&lt;br /&gt;ブラウザー統合はプロキシアプリケーションが無いと動作しません。&lt;br /&gt;期待されるパス: </translation>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation>実行ファイル</translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <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"/>
+    </message>
 </context>
 <context>
     <name>BrowserService</name>
@@ -417,153 +725,46 @@ Do you want to overwrite it?</source>
         <translation>%1 - %2 の情報を更新しますか？</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: データベースはロックされています</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>アクティブなデータベースがロックされています。
-選択されたデータベースのロックを解除するか、別のロックされていないデータベースを選択してください。</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: 設定は利用できません</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation>アクティブなデータベースに設定のエントリーが含まれていません。</translation>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: キーが見つかりません</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation>KeePassXC の設定内に共有暗号化キーは見つかりませんでした。</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: データベースからキーが削除されました</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation><numerusform>KeePassXC の設定から %n 個の暗号化キーが正常に削除されました。</numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>保存されたアクセス許可を削除しています…</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>中止</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: アクセス許可が削除されました</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation><numerusform>%n 個のエントリーからアクセス許可が正常に削除されました。</numerusform></translation>
+        <source>Converting attributes to custom data…</source>
+        <translation>属性をカスタムデータに変換しています…</translation>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: アクセス許可があるエントリーは見つかりません</translation>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation>KeePassXC: KeePassHTTP の属性を変換しました</translation>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>アクティブなデータベースにはアクセス許可があるエントリーは含まれていません。</translation>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation>%1 個のエントリーから属性を正常に変換しました。
+%2 個のキーをカスタムデータに移動しました。</translation>
     </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>パスワード</translation>
-    </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>パスワードを入力:</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>パスワードを再入力:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>キーファイル(&amp;K)</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>参照</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>作成</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>チャレンジレスポンス(&amp;L)</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>再読み込み</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>キーファイル</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>全てのファイル</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>キーファイルを作成...</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>キーファイルを作成できません: </translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>キーファイルを選択</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>空パスワード</translation>
-    </message>
-    <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>本当にパスワードとして空の文字列を使用しますか？</translation>
-    </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>異なるパスワードが入力されました。</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation><numerusform>%n 個のキーを正常にカスタムデータに移動しました。</numerusform></translation>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>%1 をキーファイルとしてセットできませんでした:
-%2</translation>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation>KeePassXC: KeePassHTTP の属性があるエントリーは見つかりません</translation>
     </message>
     <message>
-        <source>Legacy key file format</source>
-        <translation>レガシーなキーファイル形式</translation>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation>アクティブなデータベースには KeePassHTTP の属性があるエントリーは含まれていません。</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>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation>KeePassXC: レガシーなブラウザー統合の設定が検出されました</translation>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>マスターキーの変更に失敗しました: YubiKey が挿入されていません。</translation>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation>レガシーなブラウザー統合の設定が検出されました。
+設定を最新の標準にアップグレードしますか？
+これはブラウザープラグインとの互換性維持に必要です。</translation>
     </message>
 </context>
 <context>
@@ -644,14 +845,6 @@ Please consider generating a new key file.</source>
         <translation>CSV ファイルには存在しません</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>空のフィールド名</translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>列</translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>CSV ファイルからインポート</translation>
     </message>
@@ -660,48 +853,85 @@ Please consider generating a new key file.</source>
         <translation>元データ: </translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>CSV ファイルでエラーが検出されました</translation>
+        <source>Error</source>
+        <translation>エラー</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation> 個のメッセージがスキップされました]</translation>
+        <source>Empty fieldname %1</source>
+        <translation>空のフィールド名 %1</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation>エラー</translation>
+        <source>column %1</source>
+        <translation>列 %1</translation>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>CSV のインポート: ライターにエラーがあります:
-</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation>CSV ファイルでエラーが検出されました</translation>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>エラー</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation><numerusform>[%n 個のメッセージがスキップされました]</numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>マスターキーを計算できません</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation>CSV のインポート: ライターにエラーがあります:
+%1</translation>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
-        <translation><numerusform>%n バイト、</numerusform></translation>
+        <source>%n column(s)</source>
+        <translation><numerusform>%n 列</numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation>%1、%2、%3</translation>
     </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
-        <translation><numerusform>%n 行、</numerusform></translation>
+        <source>%n byte(s)</source>
+        <translation><numerusform>%n バイト</numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
-        <translation><numerusform>%n 列</numerusform></translation>
+        <source>%n row(s)</source>
+        <translation><numerusform>%n 行</numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>ルート</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>ファイル %1 は存在しません。</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>ファイル %1 を開けません。</translation>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation>データベースの読み込み中にエラーが発生しました: %1</translation>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation>データベースのファイル名が無いため、保存できませんでした。</translation>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation>ファイルは読み取り専用モードで開かれているため書き込むことはできません。</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation>データベースのロックを解除 - KeePassXC</translation>
     </message>
 </context>
 <context>
@@ -731,14 +961,6 @@ Please consider generating a new key file.</source>
         <translation>チャレンジレスポンス:</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>データベースを開けません。</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>キーファイルを開けませんでした</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation>レガシーなキーファイル形式</translation>
     </message>
@@ -747,7 +969,7 @@ Please consider generating a new key file.</source>
 unsupported in the future.
 
 Please consider generating a new key file.</source>
-        <translation>レガシーなキーファイル形式は、将来的に、
+        <translation>レガシーなキーファイル形式は将来的に、
 サポートされなくなる可能性があります。
 
 新しいキーファイルの生成を検討してください。</translation>
@@ -768,53 +990,254 @@ Please consider generating a new key file.</source>
         <source>Select key file</source>
         <translation>キーファイルを選択</translation>
     </message>
+    <message>
+        <source>TouchID for quick unlock</source>
+        <translation>TouchID で素早くロックを解除</translation>
+    </message>
+    <message>
+        <source>Unable to open the database:
+%1</source>
+        <translation>データベースを開けません:
+%1</translation>
+    </message>
+    <message>
+        <source>Can't open key file:
+%1</source>
+        <translation>キーファイルを開けません:
+%1</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
+    <message>
+        <source>Passwords</source>
+        <translation>パスワード</translation>
+    </message>
 </context>
 <context>
-    <name>DatabaseRepairWidget</name>
+    <name>DatabaseSettingsDialog</name>
     <message>
-        <source>Repair database</source>
-        <translation>データベースを修復</translation>
+        <source>Advanced Settings</source>
+        <translation>詳細設定</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation>エラー</translation>
+        <source>General</source>
+        <translation>一般</translation>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>キーファイルを開けませんでした</translation>
+        <source>Security</source>
+        <translation>セキュリティ</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>データベースを開けません。</translation>
+        <source>Master Key</source>
+        <translation>マスターキー</translation>
+    </message>
+    <message>
+        <source>Encryption Settings</source>
+        <translation>暗号化設定</translation>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation>ブラウザー統合</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetBrowser</name>
+    <message>
+        <source>KeePassXC-Browser settings</source>
+        <translation>KeePassXC-Browser 設定</translation>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>全てのブラウザーの接続を断つ(&amp;D)</translation>
+    </message>
+    <message>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation>エントリーのサイト固有の設定を全て消去する(&amp;E)</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation>KeePassHTTP の属性を KeePassXC-Browser のカスタムデータに移行する(&amp;C)</translation>
+    </message>
+    <message>
+        <source>Stored keys</source>
+        <translation>保存されたキー</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>削除</translation>
+    </message>
+    <message>
+        <source>Delete the selected key?</source>
+        <translation>選択したキーを削除しますか？</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation>本当に選択したキーを削除しますか？
+ブラウザープラグインへの接続を妨害する可能性があります。</translation>
+    </message>
+    <message>
+        <source>Key</source>
+        <translation>キー</translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation>値</translation>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation>これらの設定にアクセスするには、ブラウザー統合を有効にしてください。</translation>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation>全てのブラウザーの接続を断つ</translation>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation>本当に全てのブラウザーを切断しますか？
+ブラウザープラグインへの接続を妨害する可能性があります。</translation>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: キーが見つかりません</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation>KeePassXC の設定内に共有暗号化キーは見つかりませんでした。</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: データベースからキーが削除されました</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation><numerusform>KeePassXC の設定から %n 個の暗号化キーが正常に削除されました。</numerusform></translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>データベースは正常に開かれています。行うべきことはありません。</translation>
+        <source>Forget all site-specific settings on entries</source>
+        <translation>エントリーのサイト固有の設定を全て消去する</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>成功</translation>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation>本当にエントリー毎のサイト固有の設定を全て消去しますか？
+エントリーへのアクセス権が取り消されます。</translation>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>データベースは正常に修復されました
-データベースの保存を行ってください。</translation>
+        <source>Removing stored permissions…</source>
+        <translation>保存されたアクセス許可を削除しています…</translation>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>データベースを修復できません。</translation>
+        <source>Abort</source>
+        <translation>中止</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: アクセス許可が削除されました</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation><numerusform>%n 個のエントリーからアクセス許可が正常に削除されました。</numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: アクセス許可があるエントリーは見つかりません</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>アクティブなデータベースにはアクセス許可があるエントリーは含まれていません。</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation>KeePassHTTP の属性をカスタムデータに移行する</translation>
+    </message>
+    <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>本当にレガシーなブラウザー統合のデータを最新の標準に移行しますか？
+これはブラウザープラグインとの互換性維持に必要です。</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetEncryption</name>
     <message>
-        <source>General</source>
-        <translation>一般</translation>
+        <source>Encryption Algorithm:</source>
+        <translation>暗号化アルゴリズム:</translation>
+    </message>
+    <message>
+        <source>AES:  256 Bit   (default)</source>
+        <translation>AES: 256 ビット (既定)</translation>
+    </message>
+    <message>
+        <source>Twofish:  256 Bit</source>
+        <translation>Twofish: 256 ビット</translation>
+    </message>
+    <message>
+        <source>Key Derivation Function:</source>
+        <translation>鍵導出関数:</translation>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation>変換回数:</translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation>ベンチマーク 1秒遅延</translation>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation>メモリ使用量:</translation>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation>並列処理:</translation>
+    </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation>復号化時間:</translation>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation>?? 秒</translation>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>暗号化</translation>
+        <source>Change</source>
+        <translation>変更</translation>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation>100 ミリ秒</translation>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation>5 秒</translation>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation>値が大きいほど保護力が増しますが、データベースを開くのに時間がかかるようになります。</translation>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation>データベースの形式:</translation>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation>これはデータベースを他のプログラムで使用する必要がある場合のみ重要になります。</translation>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation>KDBX 4.0 (推奨)</translation>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation>KDBX 3.1</translation>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation>変更なし</translation>
     </message>
     <message>
         <source>Number of rounds too high</source>
@@ -868,40 +1291,15 @@ If you keep this number, your database may be too easy to crack!</source>
         <comment>Threads for parallel execution (KDF settings)</comment>
         <translation><numerusform> スレッド</numerusform></translation>
     </message>
-</context>
-<context>
-    <name>DatabaseSettingsWidgetEncryption</name>
-    <message>
-        <source>Encryption Algorithm:</source>
-        <translation>暗号化アルゴリズム:</translation>
-    </message>
-    <message>
-        <source>AES:  256 Bit   (default)</source>
-        <translation>AES: 256 ビット (既定)</translation>
-    </message>
-    <message>
-        <source>Twofish:  256 Bit</source>
-        <translation>Twofish: 256 ビット</translation>
-    </message>
-    <message>
-        <source>Key Derivation Function:</source>
-        <translation>鍵導出関数:</translation>
-    </message>
-    <message>
-        <source>Transform rounds:</source>
-        <translation>変換回数:</translation>
-    </message>
-    <message>
-        <source>Benchmark 1-second delay</source>
-        <translation>ベンチマーク 1秒遅延</translation>
-    </message>
-    <message>
-        <source>Memory Usage:</source>
-        <translation>メモリ使用量:</translation>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation><numerusform>%1 ミリ秒</numerusform></translation>
     </message>
-    <message>
-        <source>Parallelism:</source>
-        <translation>並列処理:</translation>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation><numerusform>%1 秒</numerusform></translation>
     </message>
 </context>
 <context>
@@ -952,91 +1350,112 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>ルート</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 データベース</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>全てのファイル</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>データベースを開く</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>ファイルが見つかりません</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>データベースを開けません。</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>読み取り専用でファイルを開きました。</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>CSV ファイルを開く</translation>
+        <source>Add additional protection...</source>
+        <translation>保護を追加...</translation>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>CSV ファイル</translation>
+        <source>No encryption key added</source>
+        <translation>追加された暗号化キーはありません</translation>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>全てのファイル (*)</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation>データベースをセキュアにするには、暗号化キーを少なくとも1つ追加する必要があります。</translation>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>データベースをマージする</translation>
+        <source>No password set</source>
+        <translation>パスワードを設定していません</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>KeePass 1 データベースを開く</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>[警告] パスワードを設定していません。パスワード無しでのデータベースの使用は極力避けるべきです。
+
+パスワード無しで続行してもよろしいですか？</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1 データベース</translation>
+        <source>Unknown error</source>
+        <translation>不明なエラーです</translation>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>閉じますか？</translation>
+        <source>Failed to change master key</source>
+        <translation>マスターキーの変更に失敗しました</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; は現在編集モードです。
-変更を破棄して閉じてしまってもよろしいですか？</translation>
+        <source>Database Name:</source>
+        <translation>データベース名:</translation>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>変更を保存しますか？</translation>
+        <source>Description:</source>
+        <translation>概要:</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>&quot;%1&quot; は更新されています。
-変更を保存しますか？</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 データベース</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>データベースの書き込みに失敗しました。</translation>
+        <source>All files</source>
+        <translation>全てのファイル</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>パスワード</translation>
+        <source>Open database</source>
+        <translation>データベースを開く</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>ファイル名をつけてデータベースを保存</translation>
+        <source>CSV file</source>
+        <translation>CSV ファイル</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>データベースをマージする</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>KeePass 1 データベースを開く</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 データベース</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1047,40 +1466,41 @@ Save changes?</source>
         <translation>CSV ファイルの書き込みに失敗しました。</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>新しいデータベース</translation>
+        <source>Database creation error</source>
+        <translation>データベース作成エラー</translation>
     </message>
     <message>
-        <source>locked</source>
-        <translation>ロック済み</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>作成されたデータベースはキーや KDF が無いため保存しません。
+これは確実にバグなので、開発者への報告をお願いします。</translation>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>データベースをロックする</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation>データベースファイルは存在しないか、アクセスできません。</translation>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>現在編集中のため、データベースをロックすることができませんでした。
-キャンセルボタンを押し、変更を完了させるか破棄してください。</translation>
+        <source>Select CSV file</source>
+        <translation>CSV ファイルを選択</translation>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>このデータベースは変更されました。
-ロックを行う前にデータベースを保存しますか？
-保存しない場合には変更点は失われます。</translation>
+        <source>New Database</source>
+        <translation>新しいデータベース</translation>
     </message>
     <message>
-        <source>Disable safe saves?</source>
-        <translation>安全な保存を無効にしますか？</translation>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [新しいデータベース]</translation>
     </message>
     <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 はデータベースの多段階保存に失敗しました。これは恐らく、保存するファイルをロックしているファイル同期サービスが原因だと思われます。
-安全な保存を無効にして再試行しますか？</translation>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [ロック]</translation>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [読み取り専用]</translation>
     </message>
 </context>
 <context>
@@ -1090,37 +1510,13 @@ Disable safe saves and try again?</source>
         <translation>検索中…</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>マスターキーを変更</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>エントリーを削除しますか？</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>本当にエントリー &quot;%1&quot; を永久に削除しますか？</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>エントリーを削除しますか？</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>本当に %1 個のエントリーを永久に削除しますか？</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>エントリーをゴミ箱に移動しますか？</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation>本当にエントリー &quot;%1&quot; をゴミ箱に移動しますか？</translation>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>エントリーをゴミ箱に移動しますか？</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation><numerusform>本当に %n 個のエントリーをゴミ箱に移動しますか？</numerusform></translation>
@@ -1138,18 +1534,10 @@ Disable safe saves and try again?</source>
         <translation>選択を記憶する</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>グループを削除しますか？</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>本当にグループ &quot;%1&quot; を永久に削除しますか？</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>マスターキーを計算できません</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>現在のデータベースはありません。</translation>
     </message>
@@ -1184,10 +1572,6 @@ Do you want to merge your changes?</source>
 変更をマージしますか？</translation>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>このデータベースを自動再読み込みしようとした際に、新しいデータベースファイルを開くことができませんでした。</translation>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>ゴミ箱を空にしますか？</translation>
     </message>
@@ -1195,88 +1579,107 @@ Do you want to merge your changes?</source>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>ゴミ箱にある全項目を永久に削除してもよろしいですか？</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>TOTP トークンを生成</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation><numerusform>本当に %n 個のエントリーを永久に削除しますか？</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation><numerusform>エントリーを削除しますか？</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation><numerusform>エントリーをゴミ箱に移動しますか？</numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>閉じる</translation>
+        <source>File opened in read only mode.</source>
+        <translation>読み取り専用でファイルを開きました。</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>一般</translation>
+        <source>Lock Database?</source>
+        <translation>データベースをロックしますか？</translation>
     </message>
     <message>
-        <source>Password</source>
-        <translation>パスワード</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation>エントリーを編集中です。変更を破棄してロックしてしまってもよろしいですか？</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot; は更新されています。
+変更を保存しますか？</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>有効期限</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation>データベースは更新されています。
+変更を保存しますか？</translation>
     </message>
     <message>
-        <source>Username</source>
-        <translation>ユーザー名</translation>
+        <source>Save changes?</source>
+        <translation>変更を保存しますか？</translation>
     </message>
     <message>
-        <source>Autotype</source>
-        <translation>自動入力</translation>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation>自動再読み込みしようとした際に、新しいデータベースファイルを開くことができませんでした。
+エラー: %1</translation>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>検索</translation>
+        <source>Disable safe saves?</source>
+        <translation>安全な保存を無効にしますか？</translation>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>属性</translation>
+        <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 はデータベースの多段階保存に失敗しました。これは恐らく、保存するファイルをロックしているファイル同期サービスが原因だと思われます。
+安全な保存を無効にして再試行しますか？</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>添付ファイル</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation>データベースの書き込みに失敗しました。
+%1</translation>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>メモ</translation>
+        <source>Passwords</source>
+        <translation>パスワード</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>ウィンドウ</translation>
+        <source>Save database as</source>
+        <translation>ファイル名をつけてデータベースを保存</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>シーケンス</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 データベース</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>検索</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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></translation>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>消去</translation>
+        <source>Delete group</source>
+        <translation>グループの削除</translation>
     </message>
     <message>
-        <source>Never</source>
-        <translation>なし</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[保護]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>無効</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>有効</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1350,22 +1753,10 @@ Do you want to merge your changes?</source>
         <translation>新しい属性</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>削除の確認</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>この属性を削除してもよろしいですか？</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[保護]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation>表示または編集する場合は開示をクリックしてください</translation>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>明日</translation>
     </message>
@@ -1378,10 +1769,6 @@ Do you want to merge your changes?</source>
         <translation><numerusform>%n ヶ月</numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1年</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation>生成されたパスワードを適用しますか？</translation>
     </message>
@@ -1393,6 +1780,26 @@ Do you want to merge your changes?</source>
         <source>Entry updated successfully.</source>
         <translation>エントリーは正常に更新されました。</translation>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation>エントリーに未保存の変更があります</translation>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation>新しい属性 %1</translation>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation>[保護] 表示または編集する場合は開示をクリックしてください</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n 年</numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1638,6 +2045,81 @@ Do you want to merge your changes?</source>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>フォーム</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>パスワード:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1695,10 +2177,6 @@ Do you want to merge your changes?</source>
         <translation>ファビコンを取得できません。</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>ヒント: ツール &gt; 設定 &gt; セキュリティから Google をフォールバックとして有効にすることができます</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>画像</translation>
     </message>
@@ -1707,14 +2185,6 @@ Do you want to merge your changes?</source>
         <translation>全てのファイル</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>画像を選択</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read icon</source>
-        <translation>アイコンを読み取ることができません</translation>
-    </message>
-    <message>
         <source>Custom icon already exists</source>
         <translation>カスタムアイコンは既に存在します</translation>
     </message>
@@ -1723,8 +2193,36 @@ Do you want to merge your changes?</source>
         <translation>削除の確認</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>このアイコンは %1 個のエントリーで使用されており、デフォルトのアイコンに置き換えられます。本当に削除してもよろしいですか？</translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation>カスタムアイコンは正常にダウンロードされました</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>ヒント: ツール &gt; 設定 &gt; セキュリティから DuckDuckGo をフォールバックとして有効にすることができます</translation>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation>画像を選択</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation><numerusform>%1 / %n アイコンが正常に読み込まれました</numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation>アイコンが読み込まれていません</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation><numerusform>%n 個のアイコンがデータベース内に既に存在します</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation><numerusform>次のアイコンの読み込みに失敗しました:</numerusform></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>このアイコンは %n 個のエントリーで使用されており、デフォルトのアイコンに置き換えられます。本当に削除してもよろしいですか？</numerusform></translation>
     </message>
 </context>
 <context>
@@ -1775,9 +2273,8 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation> - 複製</translation>
+        <source>%1 - Clone</source>
+        <translation>%1 - 複製</translation>
     </message>
 </context>
 <context>
@@ -1822,10 +2319,6 @@ This may cause the affected plugins to malfunction.</source>
         <translation><numerusform>%n 個の添付ファイルを削除してもよろしいですか？</numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>削除の確認</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>添付ファイルを保存</translation>
     </message>
@@ -1862,10 +2355,13 @@ This may cause the affected plugins to malfunction.</source>
 %1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation>削除の確認</translation>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>ファイルを開けません:
-%1</translation>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1949,6 +2445,106 @@ This may cause the affected plugins to malfunction.</source>
         <source>Attachments</source>
         <translation>添付ファイル</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>はい</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>TOTP トークンを生成</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>閉じる</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>一般</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>ユーザー名</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>パスワード</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>有効期限</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>属性</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>添付ファイル</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>メモ</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>自動入力</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>ウィンドウ</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>シーケンス</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>検索</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>検索</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>消去</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>なし</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[保護]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>有効</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>無効</translation>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EntryView</name>
@@ -1987,6 +2583,19 @@ This may cause the affected plugins to malfunction.</source>
         <source>Recycle Bin</source>
         <translation>ゴミ箱</translation>
     </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation>[空]</translation>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>HostInstaller</name>
@@ -2000,61 +2609,6 @@ This may cause the affected plugins to malfunction.</source>
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>文字数:</translation>
-    </message>
-    <message>
-        <source>Character Types</source>
-        <translation>文字種</translation>
-    </message>
-    <message>
-        <source>Upper Case Letters</source>
-        <translation>大文字</translation>
-    </message>
-    <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
-    </message>
-    <message>
-        <source>Lower Case Letters</source>
-        <translation>小文字</translation>
-    </message>
-    <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
-    </message>
-    <message>
-        <source>Numbers</source>
-        <translation>数字</translation>
-    </message>
-    <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
-    </message>
-    <message>
-        <source>Special Characters</source>
-        <translation>特殊な文字</translation>
-    </message>
-    <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
-    </message>
-    <message>
-        <source>Exclude look-alike characters</source>
-        <translation>よく似た文字を除外する</translation>
-    </message>
-    <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>使用する文字種の文字が必ず含まれるようにする</translation>
-    </message>
-    <message>
-        <source>Extended ASCII</source>
-        <translation>拡張 ASCII</translation>
-    </message>
-</context>
-<context>
     <name>KMessageWidget</name>
     <message>
         <source>&amp;Close</source>
@@ -2079,6 +2633,26 @@ This may cause the affected plugins to malfunction.</source>
         <source>Wrong key or database file is corrupt.</source>
         <translation>キーが間違っているかデータベースファイルが破損しています。</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation>データベースのヘッダーがありません</translation>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation>ヘッダーがハッシュと一致しません</translation>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>ヘッダー ID サイズが不正です</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>ヘッダーフィールド長が不正です</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>ヘッダーデータ長が不正です</translation>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2238,10 +2812,6 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation>暗号の UUID の長さが不正です</translation>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation>サポートしていない暗号です</translation>
     </message>
@@ -2295,6 +2865,18 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Unsupported KeePass 2 database version.</source>
         <translation>サポートしていないバージョンの KeePass 2 データベースです。</translation>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation>暗号の UUID の長さが不正です: %1 (長さ = %2)</translation>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation>UUID を解析できません: %1</translation>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2367,10 +2949,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>履歴要素の UUID が異なります</translation>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation>エントリーの文字列を復号できません</translation>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation>重複したカスタム属性が見つかりました</translation>
     </message>
@@ -2419,6 +2997,14 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation>バイナリーを展開できません</translation>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation>XML エラー:
+%1
+%2 行、%3 列</translation>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2582,28 +3168,130 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Invalid entry field type</source>
         <translation>エントリーのフィールドタイプが不正です</translation>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation>内容の位置にシークできません</translation>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>既存のシングルインスタンスロックファイルは無効です。新しいインスタンスを起動します。</translation>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>ロックファイルを作成できませんでした。シングルインスタンスモードは無効です。</translation>
+        <source>Import from</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>KeePassXC の別インスタンスが既に起動しています。</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>暗号化機能のテスト中に致命的なエラーが発生しました。</translation>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - エラー</translation>
+        <source>Key Component</source>
+        <translation>キーコンポーネント</translation>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation>キーコンポーネントの概要</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>キャンセル</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation>キーコンポーネントの設定 (変更か削除をクリックしてください)</translation>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation>%1 を追加</translation>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation>%1 を変更</translation>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation>%1 を削除</translation>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation>%1 の設定 (変更か削除をクリックしてください)</translation>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>参照</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>生成</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <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>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <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>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation>キーファイル &apos;%1&apos; の読み込み時にエラーが発生しました
+メッセージ: %2</translation>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>キーファイル</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>全てのファイル</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>キーファイルを作成...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation>キーファイル作成時にエラーが発生しました</translation>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation>キーファイルを作成できません: %1</translation>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>キーファイルを選択</translation>
     </message>
 </context>
 <context>
@@ -2617,10 +3305,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>最近使用したデータベース(&amp;R)</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>インポート</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation>ヘルプ(&amp;H)</translation>
     </message>
@@ -2629,14 +3313,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>エントリー(&amp;N)</translation>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>クリップボードにコピー(&amp;R)</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation>タイムベースワンタイムパスワード</translation>
-    </message>
-    <message>
         <source>&amp;Groups</source>
         <translation>グループ(&amp;G)</translation>
     </message>
@@ -2665,30 +3341,10 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>データベースを閉じる(&amp;C)</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>新しいデータベース(&amp;N)</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>KeePassX データベースからマージ</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>新しいエントリーを追加(&amp;A)</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>エントリーを表示/編集(&amp;V)</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>エントリーを削除(&amp;D)</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>新しいグループを追加(&amp;A)</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>グループを編集(&amp;E)</translation>
     </message>
@@ -2701,14 +3357,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>データベースを別名で保存(&amp;V)...</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>マスターキーを変更(&amp;M)...</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>データベースの設定(&amp;D)</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>データベースの設定</translation>
     </message>
@@ -2717,24 +3365,16 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>エントリーを複製(&amp;C)</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>検索(&amp;F)</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>ユーザー名をコピー(&amp;U)</translation>
     </message>
     <message>
         <source>Copy username to clipboard</source>
-        <translation>ユーザー名をコピー</translation>
-    </message>
-    <message>
-        <source>Cop&amp;y password</source>
-        <translation>パスワードをコピー(&amp;Y)</translation>
+        <translation>ユーザー名をクリップボードにコピー</translation>
     </message>
     <message>
         <source>Copy password to clipboard</source>
-        <translation>パスワードをコピー</translation>
+        <translation>パスワードをクリップボードにコピー</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
@@ -2745,14 +3385,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>パスワード生成</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation>自動入力を実行(&amp;P)</translation>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>URL を開く(&amp;O)</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>データベースをロック(&amp;L)</translation>
     </message>
@@ -2762,7 +3394,7 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>Copy title to clipboard</source>
-        <translation>タイトルをコピー</translation>
+        <translation>タイトルをクリップボードにコピー</translation>
     </message>
     <message>
         <source>&amp;URL</source>
@@ -2770,7 +3402,7 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>Copy URL to clipboard</source>
-        <translation>URL をコピー</translation>
+        <translation>URL をクリップボードにコピー</translation>
     </message>
     <message>
         <source>&amp;Notes</source>
@@ -2778,29 +3410,13 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>Copy notes to clipboard</source>
-        <translation>メモをコピー</translation>
+        <translation>メモをクリップボードにコピー</translation>
     </message>
     <message>
         <source>&amp;Export to CSV file...</source>
         <translation>CSV ファイルへエクスポート(&amp;E)...</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>KeePass 1 データベースをインポート...</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>CSV ファイルをインポート...</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>データベースを修復(&amp;P)...</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>TOTP を表示</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>TOTP の設定...</translation>
     </message>
@@ -2821,14 +3437,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>設定ファイル %1 へのアクセスエラー</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation>&lt;p&gt;ブラウザー統合に KeePassHTTP を使用しています。この機能は将来的に廃止され、削除されます。&lt;br&gt;代わりに KeePassXC-Browser を使用してください。移行に関するヘルプは &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;移行ガイド&lt;/a&gt; を参照してください (%1 / 3 回目の警告)。&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>読み取り専用</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
@@ -2841,36 +3449,278 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>KeePassXC を終了</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 データベース</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>YubiKey のボタンにタッチしてください</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>全てのファイル</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation>警告: KeePassXC の開発版を使用しています。
+データベース破損の危険性が高いため、バックアップを維持します。
+このバージョンは正式版ではありません。</translation>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>データベースを開く</translation>
+        <source>&amp;Donate</source>
+        <translation>寄付(&amp;D)</translation>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>修復されたデータベースを保存する</translation>
+        <source>Report a &amp;bug</source>
+        <translation>バグを報告(&amp;B)</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>データベースの書き込みに失敗しました。</translation>
+        <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>警告: オンスクリーンキーボード使用時に、Qt のバージョンが原因で KeePassXC がクラッシュする可能性があります。
+KeePassXC の配布ページから AppImage をダウンロードして使用することをお勧めします。</translation>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>YubiKey のボタンにタッチしてください</translation>
+        <source>&amp;Import</source>
+        <translation>インポート(&amp;I)</translation>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
-        <translation>警告: KeePassXC の開発版を使用しています。
-データベース破損の危険性が高いため、バックアップを維持します。
-このバージョンは正式版ではありません。</translation>
+        <source>Copy att&amp;ribute...</source>
+        <translation>属性をコピー(&amp;R)...</translation>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation>TOTP...</translation>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation>新しいデータベース(&amp;N)...</translation>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation>新しいデータベースを作成</translation>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation>データベースからマージ(&amp;M)...</translation>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation>別の KDBX データベースからマージ</translation>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation>新しいエントリー(&amp;N)</translation>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation>新しいエントリーを追加</translation>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation>エントリーを編集(&amp;E)</translation>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation>エントリーを編集または表示</translation>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation>新しいグループ(&amp;N)</translation>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation>新しいグループを追加</translation>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation>マスターキーを変更(&amp;K)...</translation>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation>データベースの設定(&amp;D)...</translation>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation>パスワードをコピー(&amp;P)</translation>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation>自動入力を実行(&amp;A)</translation>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation>URL を開く(&amp;U)</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation>KeePass 1 データベース...</translation>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation>KeePass 1 データベースをインポート</translation>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation>CSV ファイル...</translation>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation>CSV ファイルをインポート</translation>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation>TOTP を表示...</translation>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation>TOTP QR コードを表示...</translation>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation>存在しない %1 [%2] を作成</translation>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation>%1 [%2] を移転</translation>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation>%1 [%2] を上書き</translation>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation>データベース &quot;%1&quot; からマージされた古いエントリー</translation>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation>古いターゲット %1 [%2] のバックアップを追加</translation>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation>古いソース %1 [%2] のバックアップを追加</translation>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation>古いターゲットのエントリーを新しいソース %1 [%2] のトップに再適用</translation>
+    </message>
+    <message>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation>古いソースのエントリーを新しいターゲット %1 [%2] のトップに再適用</translation>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation>新しいソース %1 [%2] から同期</translation>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation>古いソース %1 [%2] から同期</translation>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation>子要素 %1 [%2] を削除</translation>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation>親要素が無い %1 [%2] を削除</translation>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation>削除されたオブジェクトを変更</translation>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation>存在しないアイコン %1 を追加</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation>新しい KeePassXC データベースを作成...</translation>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>ルート</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>ウィザードページ</translation>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation>暗号化の設定(&amp;C)</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>ここではデータベースの暗号化設定を調整できます。この設定は後からデータベースの設定で変更できます。</translation>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>詳細設定</translation>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation>簡易設定</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <translation>暗号化の設定</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>ここではデータベースの暗号化設定を調整できます。この設定は後からデータベースの設定で変更できます。</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation>データベースのマスターキー</translation>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation>あなただけが知るマスターキーがデータベースを保護します。</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <translation>データベースの全般情報</translation>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation>新しいデータベースの名前と、必要な場合は説明文を入力してください:</translation>
     </message>
 </context>
 <context>
@@ -2973,125 +3823,34 @@ This version is not meant for production use.</source>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation>ダイアログ</translation>
-    </message>
-    <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>このオプションは ChromeIPass や PassIFox からデータベースにアクセスするために必要です</translation>
-    </message>
-    <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>KeePassHTTP サーバーを有効にする</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>一般</translation>
-    </message>
-    <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>クレデンシャルを要求された際に通知を表示する(&amp;O)</translation>
-    </message>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>ドメイン全体にマッチする全てのエントリーの代わりに、特定の URL に最もマッチするエントリーのみが返されます。</translation>
-    </message>
-    <message>
-        <source>&amp;Return only best matching entries</source>
-        <translation>最もマッチするエントリーのみを返す(&amp;R)</translation>
-    </message>
-    <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>データベースがロックされている場合はロックの解除を要求する(&amp;Q)</translation>
-    </message>
-    <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation>同じスキーム (http://, https://, ftp://, ...) を持つエントリーのみが返されます。</translation>
-    </message>
-    <message>
-        <source>&amp;Match URL schemes</source>
-        <translation>URL スキームのマッチ(&amp;M)</translation>
-    </message>
-    <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>マッチするエントリーをユーザー名で並べ替える(&amp;U)</translation>
-    </message>
-    <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>マッチするエントリーをタイトルで並べ替える(&amp;M)</translation>
-    </message>
-    <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>アクティブなデータベースから共有暗号化キーを全て削除する(&amp;E)</translation>
-    </message>
-    <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>アクティブなデータベースのエントリーに保存されたアクセス許可を全て削除する(&amp;M)</translation>
-    </message>
-    <message>
-        <source>Password Generator</source>
-        <translation>パスワード生成</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>詳細設定</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>常にエントリーへのアクセスを許可する(&amp;A)</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>常にエントリーの更新を許可する(&amp;U)</translation>
-    </message>
-    <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>選択されたデータベースのみがクライアントと接続する必要があります。</translation>
-    </message>
-    <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>全ての開かれたデータベースからマッチするエントリーを検索する(&amp;H)</translation>
-    </message>
-    <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>文字列フィールドの自動作成や自動更新はサポートされていません。</translation>
-    </message>
-    <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>&quot;KPH: &quot; から始まる拡張された文字列フィールドを返す(&amp;R)</translation>
-    </message>
-    <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP ポート:</translation>
+        <source>Enter password:</source>
+        <translation>パスワードを入力:</translation>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>デフォルトのポート: 19455</translation>
+        <source>Confirm password:</source>
+        <translation>パスワードを確認:</translation>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC は 127.0.0.1 のこのポートをリッスンします</translation>
+        <source>Password</source>
+        <translation>パスワード</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;警告:&lt;/b&gt; 以下は危険なオプションです。</translation>
+        <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;パスワードはデータベースを保護するための基本的手段です。&lt;/p&gt;&lt;p&gt;長くて複雑なパスワードが良いパスワードとされています。KeePassXC に生成させることも可能です。&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;KeePassHTTP は将来的に廃止され、削除されます。&lt;br&gt;代わりに KeePassXC-Browser を使用してください。移行に関するヘルプは &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;移行ガイド&lt;/a&gt; を参照してください。&lt;/p&gt;</translation>
+        <source>Password cannot be empty.</source>
+        <translation>パスワードは空にできません。</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>特権ポートにバインドできません</translation>
+        <source>Passwords do not match.</source>
+        <translation>パスワードが一致しません。</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>1024 以下の特権ポートにバインドできません。
-デフォルトのポート 19455 を使用します。</translation>
+        <source>Generate master password</source>
+        <translation>マスターパスワードを生成</translation>
     </message>
 </context>
 <context>
@@ -3135,7 +3894,7 @@ Using default port 19455.</source>
     </message>
     <message>
         <source>Special Characters</source>
-        <translation>特殊な文字</translation>
+        <translation>特殊文字</translation>
     </message>
     <message>
         <source>Extended ASCII</source>
@@ -3162,18 +3921,10 @@ Using default port 19455.</source>
         <translation>単語リスト:</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>単語数:</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>単語の区切り文字:</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>生成</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>コピー</translation>
     </message>
@@ -3186,10 +3937,6 @@ Using default port 19455.</source>
         <translation>閉じる</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>適用</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>エントロピー: %1 ビット</translation>
     </message>
@@ -3217,6 +3964,171 @@ Using default port 19455.</source>
         <comment>Password quality</comment>
         <translation>すばらしい</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation>拡張 ASCII</translation>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation>詳細モードに切り替え</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>詳細設定</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation>大文字の A ～ F</translation>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation>小文字の A ～ F</translation>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation>括弧</translation>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation>{[(</translation>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation>句読点</translation>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation>.,:;</translation>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation>引用符</translation>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation>&quot; &apos;</translation>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation>数学記号</translation>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation>&lt;*+!?=</translation>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation>ダッシュ</translation>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation>\_|-/</translation>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation>表語文字</translation>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation>#$%&amp;&amp;@^`~</translation>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation>簡易モードに切り替え</translation>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation>簡易設定</translation>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation>生成されたパスワードから文字集合を除外する</translation>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation>次を除外:</translation>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation>&quot;除外&quot; リストに非16進数の文字列を追加</translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation>16進数</translation>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation>除外される文字: &quot;0&quot;、&quot;1&quot;、&quot;l&quot;、&quot;I&quot;、&quot;O&quot;、&quot;|&quot;、&quot;﹒&quot;</translation>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation>単語数(&amp;U):</translation>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation>再生成</translation>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>削除</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>削除</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>無効</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3237,34 +4149,18 @@ Using default port 19455.</source>
         <translation>メッセージを復号できません</translation>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
-        <translation>KeePassXC に接続できないかタイムアウトしました</translation>
-    </message>
-    <message>
         <source>Action cancelled or denied</source>
         <translation>アクションがキャンセルまたは拒否されました</translation>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation>メッセージを暗号化できないか、公開鍵が見つかりません。Native Messaging は KeePassXC で有効化されていますか？</translation>
-    </message>
-    <message>
         <source>KeePassXC association failed, try again</source>
         <translation>KeePassXC のアソシエーションに失敗しました。再試行してください。</translation>
     </message>
     <message>
-        <source>Key change was not successful</source>
-        <translation>キーの変更は成功しませんでした</translation>
-    </message>
-    <message>
         <source>Encryption key is not recognized</source>
         <translation>暗号化キーが認識されません</translation>
     </message>
     <message>
-        <source>No saved databases found</source>
-        <translation>保存されたデータベースが見つかりません</translation>
-    </message>
-    <message>
         <source>Incorrect action</source>
         <translation>不正確なアクションです</translation>
     </message>
@@ -3390,15 +4286,11 @@ Using default port 19455.</source>
         <translation>%1 のロックを解除するパスワードを入力してください: </translation>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation>キーファイル %1 の読み込みに失敗しました: %2</translation>
-    </message>
-    <message>
         <source>WARNING: 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>
@@ -3447,7 +4339,7 @@ Available commands:
     </message>
     <message>
         <source>Use the same credentials for both database files.</source>
-        <translation>両方のデータベースファイルに対して同一のクレデンシャルを使用する。</translation>
+        <translation>両方のデータベースファイルに対して同一の資格情報を使用する。</translation>
     </message>
     <message>
         <source>Key file of the database to merge from.</source>
@@ -3478,12 +4370,6 @@ Available commands:
         <translation>デバイス読み込みエラー</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>空ファイルです
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation>不正な形式の文字列</translation>
     </message>
@@ -3492,30 +4378,6 @@ Available commands:
         <translation>閉じ引用符がありません</translation>
     </message>
     <message>
-        <source>AES: 256-bit</source>
-        <translation>AES: 256 ビット</translation>
-    </message>
-    <message>
-        <source>Twofish: 256-bit</source>
-        <translation>Twofish: 256 ビット</translation>
-    </message>
-    <message>
-        <source>ChaCha20: 256-bit</source>
-        <translation>ChaCha20: 256 ビット</translation>
-    </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – 推奨)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 4)</source>
-        <translation>AES-KDF (KDBX 4)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 3.1)</source>
-        <translation>AES-KDF (KDBX 3.1)</translation>
-    </message>
-    <message>
         <source>Group</source>
         <translation>グループ</translation>
     </message>
@@ -3544,10 +4406,6 @@ Available commands:
         <translation>作成日時</translation>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
-        <translation>レガシーなブラウザー統合</translation>
-    </message>
-    <message>
         <source>Browser Integration</source>
         <translation>ブラウザー統合</translation>
     </message>
@@ -3576,10 +4434,6 @@ Available commands:
         <translation>ダイスウェアパスフレーズの単語数。</translation>
     </message>
     <message>
-        <source>count</source>
-        <translation>カウント</translation>
-    </message>
-    <message>
         <source>Wordlist for the diceware generator.
 [Default: EFF English]</source>
         <translation>ダイスウェアジェネレーターの単語リスト。
@@ -3590,28 +4444,441 @@ Available commands:
         <translation>新しいランダムなパスワードを生成する。</translation>
     </message>
     <message>
-        <source>Length of the generated password.</source>
-        <translation>生成されるパスワードの長さ。</translation>
+        <source>Invalid value for password length %1.</source>
+        <translation>%1 はパスワードの長さとして適正な値ではありません。</translation>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation>パス %1 のエントリーを作成できませんでした。</translation>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation>新しいエントリーのパスワードを入力してください: </translation>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
-        <translation>小文字を使用したパスワードを生成する。</translation>
+        <source>Writing the database failed %1.</source>
+        <translation>データベースへの書き込みはエラー &quot;%1&quot; で失敗しました。</translation>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
-        <translation>大文字を使用したパスワードを生成する。</translation>
+        <source>Successfully added entry %1.</source>
+        <translation>エントリー %1 は正常に追加されました。</translation>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
-        <translation>数字を使用したパスワードを生成する。</translation>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation>現在の TOTP をクリップボードにコピーする。</translation>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
-        <translation>特殊な文字を使用したパスワードを生成する。</translation>
+        <source>Invalid timeout value %1.</source>
+        <translation>タイムアウトの値 %1 は不正です。</translation>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
-        <translation>拡張 ASCII を使用したパスワードを生成する。</translation>
+        <source>Entry %1 not found.</source>
+        <translation>エントリー %1 が見つかりません。</translation>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation>パス %1 のエントリーには TOTP の設定がありません。</translation>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation>エントリーの現在の TOTP がクリップボードにコピーされました。</translation>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation>エントリーのパスワードがクリップボードにコピーされました。</translation>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation><numerusform>%1 秒後にクリップボードを消去します...</numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation>クリップボードは消去されました。</translation>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation>パスワードプロンプトやその他の様々な出力を抑制する。</translation>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation>カウント</translation>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation>パスワードの長さの値が不正です: %1</translation>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation>パス %1 のエントリーを見つけられませんでした。</translation>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation>エントリー %1 のフィールドは変更されていません。</translation>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation>エントリーの新しいパスワードを入力してください: </translation>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation>データベースへの書き込みは失敗しました: %1</translation>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation>エントリー %1 は正常に編集されました。</translation>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation>長さ %1</translation>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation>エントロピー %1</translation>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation>log10 %1</translation>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation>マルチワードエクストラビット %1</translation>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation>種類: ブルートフォース</translation>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation>種類: 辞書</translation>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation>種類: 辞書 + Leet</translation>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation>種類: ユーザー辞書</translation>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation>種類: ユーザー辞書 + Leet</translation>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation>種類: リピート</translation>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation>種類: 順序</translation>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation>種類: 空間</translation>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation>種類: 日付</translation>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation>種類: ブルートフォース (反復)</translation>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation>種類: 辞書 (反復)</translation>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation>種類: 辞書 + Leet (反復)</translation>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation>種類: ユーザー辞書 (反復)</translation>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation>種類: ユーザー辞書 + Leet (反復)</translation>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation>種類: リピート (反復)</translation>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation>種類: 順序 (反復)</translation>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation>種類: 空間 (反復)</translation>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation>種類: 日付 (反復)</translation>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation>種類: 不明 (%1)</translation>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation>エントロピー %1 (%2)</translation>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation>*** パスワードの長さ (%1) != 各長さの合計値 (%2) ***</translation>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation>キーファイル %1 の読み込みに失敗しました: %2</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>ファイル %1 は存在しません。</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>ファイル %1 を開けません。</translation>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation>データベースの読み込み中にエラーが発生しました:
+%1</translation>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation>データベースの解析中にエラーが発生しました:
+%1</translation>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation>生成されるパスワードの長さ</translation>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation>小文字を使用する</translation>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation>大文字を使用する</translation>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation>数字を使用する。</translation>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation>特殊文字を使用する</translation>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation>拡張 ASCII を使用する</translation>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation>文字集合を除外する</translation>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation>文字</translation>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation>よく似た文字を除外する</translation>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation>選択された各グループの文字を含む</translation>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation>グループの要素を再帰的にリスト化する。</translation>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation>グループ %1 が見つかりません。</translation>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation>マージするファイルの読み込み時にエラーが発生しました:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation>データベースをファイルに保存できません: %1</translation>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation>データベースをファイルに保存できません: %1</translation>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation>エントリー %1 は正常にリサイクルされました。</translation>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation>エントリー %1 は正常に削除されました。</translation>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation>エントリーの現在の TOTP を表示する。</translation>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation>エラー: %1 は不明な属性です。</translation>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation>クリップボード操作用プログラムとして定義されていません</translation>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation>プログラム %1 を起動できません</translation>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation>空ファイル</translation>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation>%1: (行, 列) %2,%3</translation>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256 ビット</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256 ビット</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256 ビット</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – 推奨)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation>設定が不正です</translation>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation>キーが不正です</translation>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>データベースからエントリーを削除する。</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>削除するエントリーのパス。</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>既存のシングルインスタンスロックファイルは無効です。新しいインスタンスを起動します。</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>ロックファイルを作成できませんでした。シングルインスタンスモードは無効です。</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - クロスプラットフォームのパスワードマネージャー</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>開くパスワードデータベースのファイル名 (*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>カスタム設定ファイルへのパス</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>データベースのキーファイル</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>標準入力からデータベースのパスワードを読み込む</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation>親ウィンドウハンドル</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>KeePassXC の別インスタンスが既に起動しています。</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>暗号化機能のテスト中に致命的なエラーが発生しました。</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - エラー</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation>データベースのパスワード: </translation>
     </message>
 </context>
 <context>
@@ -3649,12 +4916,98 @@ Available commands:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
+    <message>
+        <source>Agent connection failed.</source>
+        <translation>エージェントの接続に失敗しました。</translation>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation>エージェントのプロトコルエラーです。</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation>エージェントが実行されていないため、Identity を追加できません。</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation>エージェントが実行されていないため、Identity を削除できません。</translation>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation>エージェントがこの Identity を拒否しました。次の理由が考えられます:</translation>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation>キーが既に追加されている。</translation>
+    </message>
     <message>
-        <source>Search...</source>
-        <translation>検索...</translation>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation>エージェントが有効期間の制限をサポートしていない (オプションを確認)。</translation>
     </message>
     <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation>エージェントが確認要求をサポートしていない (オプションを確認)。</translation>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation>検索のヘルプ</translation>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation>検索語は次の通りです: [修飾子][フィールド:][&quot;]用語[&quot;]</translation>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation>用語は全て一致する必要があります (つまり論理積)</translation>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation>修飾子</translation>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation>結果から用語を除外</translation>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation>用語が完全に一致</translation>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation>用語に正規表現を使用</translation>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation>フィールド</translation>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation>用語のワイルドカード</translation>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation>何れかが一致</translation>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation>一文字一致</translation>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation>論理和</translation>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation>例</translation>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
         <source>Search</source>
         <translation>検索</translation>
     </message>
@@ -3663,314 +5016,316 @@ Available commands:
         <translation>消去</translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation>大文字と小文字の区別</translation>
-    </message>
-    <message>
         <source>Limit search to selected group</source>
         <translation>選択したグループに検索対象を制限</translation>
     </message>
+    <message>
+        <source>Search Help</source>
+        <translation>検索のヘルプ</translation>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation>検索 (%1)...</translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation>大文字と小文字を区別</translation>
+    </message>
 </context>
 <context>
-    <name>Service</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC: 新しいキーのアソシエーション要求</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation>他のアプリケーションからのアソシエーション要求を受け取りました。
-KeePassXC のデータベースへのアクセスを許可したい場合は、
-要求元を識別して受け入れるためのユニークな名前を付けてください。</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: 既存のキーを上書きしますか？</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>共有暗号化キー &quot;%1&quot; は既に存在します。
-上書きしますか？</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: エントリーを更新</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>%1 - %2 の情報を更新しますか？</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: データベースはロックされています</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>アクティブなデータベースがロックされています。
-選択されたデータベースのロックを解除するか、別のロックされていないデータベースを選択してください。</translation>
+        <source>Key:</source>
+        <translation>キー:</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: データベースからキーが削除されました</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation><numerusform>KeePassX/Http の設定から %n 個の暗号化キーが正常に削除されました。</numerusform></translation>
+        <source>Generate</source>
+        <translation>生成</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: キーが見つかりません</translation>
+        <source>Import</source>
+        <translation>インポート</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>KeePassHttp の設定内に共有暗号化キーは見つかりませんでした。</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: 設定は利用できません</translation>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>アクティブなデータベースに KeePassHttp の設定のエントリーが含まれていません。</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>保存されたアクセス許可を削除しています…</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>中止</translation>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: アクセス許可が削除されました</translation>
+        <source>Remove</source>
+        <translation>削除</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation><numerusform>%n 個のエントリーからアクセス許可が正常に削除されました。</numerusform></translation>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: アクセス許可があるエントリーは見つかりません</translation>
+        <source>Status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>アクティブなデータベースにはアクセス許可があるエントリーは含まれていません。</translation>
+        <source>Fingerprint</source>
+        <translation>フィンガープリント</translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
-        <translation>アプリケーション設定</translation>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>一般</translation>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>セキュリティ</translation>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>設定ファイル %1 へのアクセスエラー</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>基本設定</translation>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>KeePassXC のインスタンスを一つだけ起動する</translation>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>最近使用したデータベースを記憶する</translation>
+        <source>All files</source>
+        <translation>全てのファイル</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>最近使用したキーファイルとセキュリティードングルを記憶する</translation>
+        <source>Select path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>起動時に前回のデータベースを読み込む</translation>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>終了時に自動的に保存する</translation>
+        <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"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>変更するたびに自動的に保存する</translation>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>編集された際に自動でデータベースを再読み込みする</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>クリップボードにコピーしたら最小化する</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>アプリケーション起動時にウィンドウを最小化する</translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>エントリー作成時にグループのアイコンを使用する</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>データ以外の変更 (例えばグループの展開) に対して、データベースを修正済みとしてマークしないようにする</translation>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
-        <translation>詳細ビューを非表示にする</translation>
+        <source>Never</source>
+        <translation>なし</translation>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>システムトレイアイコンを表示する</translation>
+        <source>Always</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>最小化された際にシステムトレイへ格納する</translation>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
-        <translation>アプリケーション終了ではなくシステムトレイへ格納する</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
-        <translation>ダークシステムトレイアイコン</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>言語</translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>自動入力</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>グローバル自動入力のウィンドウの照合にエントリーのタイトルを使用する</translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>グローバル自動入力のウィンドウの照合にエントリーの URL を使用する</translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation>自動入力を行う前に毎回確認する</translation>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>グローバル自動入力のショートカット</translation>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>自動入力の遅延</translation>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation>ミリ秒</translation>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
-        <translation>起動</translation>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
-        <translation>ファイル管理</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation>安全にデータベースファイルを保存する (Dropbox などのサービスでは動作しない可能性があります)</translation>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
-        <translation>保存する前にデータベースファイルをバックアップする</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
-        <translation>エントリー管理</translation>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>一般</translation>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
-        <translation>タイムアウト</translation>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>次の時間が過ぎたらクリップボードを消去</translation>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>秒</translation>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>未操作の時間が続いたらデータベースをロック</translation>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>利便性</translation>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>セッションがロックされたりラップトップが閉じられた際にデータベースをロックする</translation>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>ウィンドウを最小化したらデータベースをロックする</translation>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>TotpDialog</name>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>パスワードが表示されている場合は、パスワードの再入力を必要としないようにする</translation>
+        <source>Timed Password</source>
+        <translation>時限パスワード</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>パスワードはデフォルトで平文表示にする</translation>
+        <source>000000</source>
+        <translation>000000</translation>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
-        <translation>プレビューパネルのパスワードを非表示にする</translation>
+        <source>Copy</source>
+        <translation>コピー</translation>
+    </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation><numerusform>期限切れまで &lt;b&gt;%n&lt;/b&gt; 秒</numerusform></translation>
     </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
     <message>
-        <source>Hide entry notes by default</source>
-        <translation>エントリーのメモをデフォルトで非表示にする</translation>
+        <source>Copy</source>
+        <translation>コピー</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>プライバシー</translation>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation>メモ: これらの TOTP 設定は他の Authenticator では動作しない可能性があります。</translation>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>ウェブサイトのアイコンをダウンロードするためのフォールバックとして Google を使用する</translation>
+        <source>There was an error creating the QR code.</source>
+        <translation>QR コードの作成中にエラーが発生しました。</translation>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
-        <translation>自動入力実行後に以前ロックされたデータベースを再ロックする</translation>
+        <source>Closing in %1 seconds.</source>
+        <translation>%1 秒後に閉じます。</translation>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation>TOTP の設定</translation>
@@ -3992,59 +5347,84 @@ Please unlock the selected database or choose another one which is unlocked.</so
         <translation>カスタム設定を使用する</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>注意: 何をしようとしているのか理解している場合にのみ、設定を変更してください。</translation>
+        <source>Custom Settings</source>
+        <translation>カスタム設定</translation>
     </message>
     <message>
         <source>Time step:</source>
         <translation>タイムステップ:</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8桁</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>秒</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>コードサイズ:</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6桁</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>コードサイズ:</translation>
+        <source>7 digits</source>
+        <translation>7桁</translation>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>秒</translation>
+        <source>8 digits</source>
+        <translation>8桁</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>時限パスワード</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>コピー</translation>
+        <source>Close</source>
+        <translation>閉じる</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>期限切れまで</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>秒</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>データベースのロックを解除</translation>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4079,42 +5459,26 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
 </context>
 <context>
-    <name>main</name>
-    <message>
-        <source>Remove an entry from the database.</source>
-        <translation>データベースからエントリーを削除する。</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>データベースのパス。</translation>
-    </message>
-    <message>
-        <source>Path of the entry to remove.</source>
-        <translation>削除するエントリーのパス。</translation>
-    </message>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - クロスプラットフォームのパスワードマネージャー</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>開くパスワードデータベースのファイル名 (*.kdbx)</translation>
+        <source>Refresh</source>
+        <translation>再読み込み</translation>
     </message>
     <message>
-        <source>path to a custom config file</source>
-        <translation>カスタム設定ファイルへのパス</translation>
+        <source>YubiKey Challenge-Response</source>
+        <translation>YubiKey のチャレンジレスポンス</translation>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>データベースのキーファイル</translation>
+        <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>&lt;p&gt;セキュリティ対策として &lt;a href=&quot;https://www.yubico.com/&quot;&gt;YubiKey&lt;/a&gt; を使用できます。&lt;/p&gt;&lt;p&gt;YubiKey のスロットの1つを &lt;a href=&quot;https://www.yubico.com/products/services-software/personalization-tools/challenge-response/&quot;&gt;HMAC-SHA1 チャレンジレスポンス&lt;/a&gt; に設定する必要があります。&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>標準入力からデータベースのパスワードを読み込む</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation>YubiKey が検出されませんでした。挿入されているかどうか確認してください。</translation>
     </message>
     <message>
-        <source>Parent window handle</source>
-        <translation>親ウィンドウハンドル</translation>
+        <source>No YubiKey inserted.</source>
+        <translation>YubiKey が挿入されていません。</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_kk.ts b/share/translations/keepassx_kk.ts
index 4531122bf..059c683da 100644
--- a/share/translations/keepassx_kk.ts
+++ b/share/translations/keepassx_kk.ts
@@ -10,20 +10,31 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
         <source>Contributors</source>
         <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
         <source>Debug Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy to clipboard</source>
+        <source>Include the following information whenever you report a bug:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Version %1
-</source>
+        <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -31,6 +42,10 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Distribution: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Libraries:</source>
         <translation type="unfinished"/>
     </message>
@@ -45,51 +60,333 @@ Kernel: %3 %4</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <source>Project Maintainers:</source>
         <translation type="unfinished"/>
     </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>
+        <source>Special thanks from the KeePassXC team go to debfx for creating the original KeePassX.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Project Maintainers:</source>
+        <source>Version %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
+        <source>Build Type: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Include the following information whenever you report a bug:</source>
+        <source>Auto-Type</source>
+        <translation>Автотеру</translation>
+    </message>
+    <message>
+        <source>Browser Integration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Distribution: %1</source>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>YubiKey</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>AccessControlDialog</name>
+    <name>AgentSettingsWidget</name>
     <message>
-        <source>Remember this decision</source>
+        <source>Enable SSH Agent (requires restart)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Allow</source>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Қолданба баптаулары</translation>
+    </message>
     <message>
-        <source>Deny</source>
+        <source>General</source>
+        <translation>Жалпы</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Қауіпсіздік</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>%1 has requested access to passwords for the following item(s).
-Please select whether you want to allow access.</source>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Соңғы дерекқорларды есте сақтау:</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Әр өзгерістен кейін автосақтау</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Шығу кезінде автосақтау</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>Жазбаны жасау кезінде топ таңбашасын қолдану</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Алмасу буферіне көшіру кезінде қолданбаны қайыру</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Жалпы</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Жүйелік трей таңбашасын қолдану</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Қолданба қайырылған кезде терезені жүйелік трейге жасыру</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Тіл</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Автотеру</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Глобалды автотеру жарлығы</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>Алмасу буферін тазалау алдындағы кідіріс</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>сек</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>Дерекқорларды белсенділік жоқ кезде блоктау алдындағы кідіріс</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -103,6 +400,26 @@ Please select whether you want to allow access.</source>
         <source>Auto-Type - KeePassXC</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Автотеру</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoTypeAssociationsModel</name>
@@ -120,90 +437,322 @@ Please select whether you want to allow access.</source>
     </message>
 </context>
 <context>
+    <name>AutoTypeMatchModel</name>
+    <message>
+        <source>Group</source>
+        <translation>Топ</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Атауы</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Пайдаланушы аты</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Тізбек</translation>
+    </message>
+</context>
+<context>
     <name>AutoTypeSelectDialog</name>
     <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Select entry to Auto-Type:</source>
         <translation>Автотеру үшін жазбаны таңдаңыз:</translation>
     </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
     <message>
-        <source>Auto-Type - KeePassXC</source>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember this decision</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"/>
+    </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"/>
     </message>
 </context>
 <context>
-    <name>ChangeMasterKeyWidget</name>
+    <name>BrowserEntrySaveDialog</name>
     <message>
-        <source>Password</source>
-        <translation>Пароль</translation>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enter password:</source>
-        <translation>Парольді енгізіңіз:</translation>
+        <source>Ok</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Repeat password:</source>
-        <translation>Парольді қайталаңыз:</translation>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Browse</source>
-        <translation>Шолу</translation>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
     <message>
-        <source>Create</source>
-        <translation>Жасау</translation>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key files</source>
-        <translation>Кілттер файлдары</translation>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Барлық файлдар</translation>
+        <source>Enable KeepassXC browser integration</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Create Key File...</source>
-        <translation>Кілттер файлын жасау...</translation>
+        <source>General</source>
+        <translation>Жалпы</translation>
     </message>
     <message>
-        <source>Unable to create Key File : </source>
-        <translation>Кілттер файлын жасау мүмкін емес:</translation>
+        <source>Enable integration for these browsers:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Select a key file</source>
-        <translation>Кілттер файлын таңдаңыз</translation>
+        <source>&amp;Google Chrome</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>Пароль ретінде бос жолды қолдануды шынымен қалайсыз ба?</translation>
+        <source>&amp;Firefox</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Different passwords supplied.</source>
-        <translation>Әр түрлі парольдер көрсетілді.</translation>
+        <source>&amp;Chromium</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>%1 файлын кілттер файлы ретінде орнату қатесі:
-%2</translation>
+        <source>&amp;Vivaldi</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Key file</source>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cha&amp;llenge Response</source>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Refresh</source>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty password</source>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
+        <source>Advanced</source>
+        <translation>Кеңейтілген</translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation type="unfinished"/>
+    </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: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not ask permission for HTTP &amp;Basic Auth</source>
+        <extracomment>An extra HTTP Basic Auth setting</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Converting attributes to custom data…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -214,15 +763,15 @@ Please select whether you want to allow access.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Replace username and password with references</source>
+        <source>Append &apos; - Clone&apos; to title</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy history</source>
+        <source>Replace username and password with references</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Append &apos; - Clone&apos; to title</source>
+        <source>Copy history</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -285,66 +834,91 @@ Please select whether you want to allow access.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty fieldname </source>
+        <source>Imported from CSV file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>column </source>
+        <source>Original data: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Imported from CSV file</source>
-        <translation type="unfinished"/>
+        <source>Error</source>
+        <translation>Қате</translation>
     </message>
     <message>
-        <source>Original data: </source>
+        <source>Empty fieldname %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
+        <source>column %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source> more messages skipped]</source>
+        <source>Error(s) detected in CSV file!</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Error</source>
-        <translation>Қате</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>CSV import: writer has errors:
-</source>
+%1</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CsvImportWizard</name>
+    <name>CsvParserModel</name>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
-        <source>Import CSV file</source>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Error</source>
-        <translation>Қате</translation>
+    <message numerus="yes">
+        <source>%n byte(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source>Unable to calculate master key</source>
-        <translation>Басты парольді есептеу мүмкін емес</translation>
+    <message numerus="yes">
+        <source>%n row(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
-    <name>CsvParserModel</name>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Түбір</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <source> byte, </source>
+        <source>Error while reading the database: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source> rows, </source>
+        <source>Could not save, database has no file name.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source> columns</source>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -367,12 +941,27 @@ Please select whether you want to allow access.</source>
         <translation>Шолу</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Дерекқорды ашу мүмкін емес.</translation>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Кілттер файлын ашу мүмкін емес</translation>
+        <source>Don&apos;t show this warning again</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>All files</source>
@@ -387,76 +976,328 @@ Please select whether you want to allow access.</source>
         <translation>Кілттер файлын таңдаңыз</translation>
     </message>
     <message>
-        <source>Refresh</source>
+        <source>TouchID for quick unlock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Challenge Response:</source>
+        <source>Unable to open the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can't open key file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
+    <message>
+        <source>Passwords</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>DatabaseRepairWidget</name>
+    <name>DatabaseSettingsDialog</name>
     <message>
-        <source>Repair database</source>
-        <translation>Дерекқорды жөндеу</translation>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Қате</translation>
+        <source>General</source>
+        <translation>Жалпы</translation>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Кілттер файлын ашу мүмкін емес</translation>
+        <source>Security</source>
+        <translation>Қауіпсіздік</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Дерекқор сәтті ашылды. Басқа орындайтын әрекеттер жоқ.</translation>
+        <source>Master Key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Дерекқорды ашу мүмкін емес.</translation>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetBrowser</name>
+    <message>
+        <source>KeePassXC-Browser settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Stored keys</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Өшіру</translation>
+    </message>
+    <message>
+        <source>Delete the selected key?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Success</source>
-        <translation>Сәтті</translation>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>Дерекқор қалпына сәтті келтірілді.
-Енді оны сақтауыңызға болады.</translation>
+        <source>KeePassXC: Removed permissions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>Дерекқорды жөндеу мүмкін емес.</translation>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetEncryption</name>
     <message>
-        <source>Database name:</source>
-        <translation>Дерекқор аты:</translation>
+        <source>Encryption Algorithm:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Database description:</source>
-        <translation>Дерекқор сипаттамасы:</translation>
+        <source>AES:  256 Bit   (default)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish:  256 Bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Derivation Function:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Transform rounds:</source>
         <translation>Түрлендірулер саны:</translation>
     </message>
     <message>
-        <source>Default username:</source>
-        <translation>Үнсіз келісім пайдаланушы аты:</translation>
+        <source>Benchmark 1-second delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
         <source> MiB</source>
-        <translation>МиБ</translation>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>Дерекқор аты:</translation>
     </message>
     <message>
-        <source>Benchmark</source>
-        <translation>Сынау</translation>
+        <source>Database description:</source>
+        <translation>Дерекқор сипаттамасы:</translation>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation>Үнсіз келісім пайдаланушы аты:</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Max. history items:</source>
@@ -467,276 +1308,344 @@ You can now save it.</source>
         <translation>Макс. тарих өлшемі:</translation>
     </message>
     <message>
-        <source>Use recycle bin</source>
-        <translation type="unfinished"/>
+        <source> MiB</source>
+        <translation>МиБ</translation>
     </message>
     <message>
-        <source>AES:  256 Bit   (default)</source>
+        <source>Use recycle bin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Twofish:  256 Bit</source>
+        <source>Additional Database Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Algorithm:</source>
+        <source>Enable &amp;compression (recommended)</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <translation>Түбір</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 дерекқоры</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Барлық файлдар</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Дерекқорды ашу</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>Файл табылмады!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>KeePass 1 дерекқорын ашу</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1 дерекқоры</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>All files (*)</source>
-        <translation>Барлық файлдар (*)</translation>
+        <source>Add additional protection...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>Жабу керек пе?</translation>
+        <source>No encryption key added</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>Өзгерістерді сақтау керек пе?</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>&quot;%1&quot; өзгертілген.
-Өзгерістерді сақтау керек пе?</translation>
+        <source>No password set</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Дерекқорға жазу сәтсіз аяқталды.</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 type="unfinished"/>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Дерекқорды қалайша сақтау</translation>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>New database</source>
-        <translation>Жаңа дерекқор</translation>
+        <source>Failed to change master key</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>locked</source>
-        <translation>блокталған</translation>
+        <source>Database Name:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>Дерекқорды блоктау</translation>
+        <source>Description:</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>Дерекқорды блоктау мүмкін емес, өйткені сіз оны қазір түзетудесіз.
-Өзгерістерді аяқтау үшін бас тартуды басыңыз, немесе оларды елемеңіз.</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 дерекқоры</translation>
     </message>
     <message>
-        <source>This database has never been saved.
-You can save the database or stop locking it.</source>
-        <translation>Дерекқор ешқашан сақталмаған.
-Сіз дерекқорды сақтай аласыз, немесе оның блокауын алып тастай аласыз.</translation>
+        <source>All files</source>
+        <translation>Барлық файлдар</translation>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>Дерекқор өзгертілген.
-Оны блоктау алдында өзгерістерді сақтау керек пе?
-Сақтамасаңыз, өзгерістер жоғалады.</translation>
+        <source>Open database</source>
+        <translation>Дерекқорды ашу</translation>
     </message>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; қазір түзету режимінде.
-Оған қарамастан, өзгерістерді елемей, оны жабу керек пе?</translation>
+        <source>CSV file</source>
+        <translation>CSV файлы</translation>
     </message>
     <message>
-        <source>Export database to CSV file</source>
-        <translation>Дерекқорды CSV файлына экспорттау</translation>
+        <source>Merge database</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>CSV файлы</translation>
+        <source>Open KeePass 1 database</source>
+        <translation>KeePass 1 дерекқорын ашу</translation>
     </message>
     <message>
-        <source>Writing the CSV file failed.</source>
-        <translation>CSV файлына жазу сәтсіз аяқталды.</translation>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 дерекқоры</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Дерекқорды ашу мүмкін емес.</translation>
+        <source>Export database to CSV file</source>
+        <translation>Дерекқорды CSV файлына экспорттау</translation>
     </message>
     <message>
-        <source>Merge database</source>
+        <source>Writing the CSV file failed.</source>
+        <translation>CSV файлына жазу сәтсіз аяқталды.</translation>
+    </message>
+    <message>
+        <source>Database creation error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The database you are trying to save as is locked by another instance of KeePassXC.
-Do you want to save it anyway?</source>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Passwords</source>
+        <source>The database file does not exist or is not accessible.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Database already opened</source>
+        <source>Select CSV file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-
-Do you want to open it anyway?</source>
+        <source>New Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open read-only</source>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open CSV file</source>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DatabaseWidget</name>
     <message>
-        <source>Change master key</source>
-        <translation>Басты парольді өзгерту</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>Жазбаны өшіру керек пе?</translation>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>&quot;%1&quot; жазбасын өшіруді шынымен қалайсыз ба?</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Жазбаларды өшіру керек пе?</translation>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation>&quot;%1&quot; жазбасын қоқыс шелегіне тастауды шынымен қалайсыз ба?</translation>
     </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>%1 жазбаны өшіруді шынымен қалайсыз ба?</translation>
+    <message numerus="yes">
+        <source>Do you really want to move %n entry(s) to the recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Жазбаларды қоқыс шелегіне тастау керек пе?</translation>
+        <source>Execute command?</source>
+        <translation type="unfinished"/>
     </message>
-    <message numerus="yes">
-        <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation><numerusform>%n жазбаны қоқыс шелегіне тастауды шынымен қалайсыз ба?</numerusform></translation>
+    <message>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Топты өшіру керек пе?</translation>
+        <source>Remember my choice</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>&quot;%1&quot; тобын өшіруді шынымен қалайсыз ба?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Басты парольді есептеу мүмкін емес</translation>
+        <source>No current database.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Жазбаны қоқыс шелегіне тастау керек пе?</translation>
+        <source>No source database, nothing to do.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>&quot;%1&quot; жазбасын қоқыс шелегіне тастауды шынымен қалайсыз ба?</translation>
+        <source>Search Results (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searching...</source>
+        <source>No Results</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>No current database.</source>
+        <source>File has changed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>No source database, nothing to do.</source>
+        <source>The database file has changed. Do you want to load the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Search Results (%1)</source>
+        <source>Merge Request</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>No Results</source>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Execute command?</source>
+        <source>Empty recycle bin?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation type="unfinished"/>
     </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>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
-        <source>Remember my choice</source>
+        <source>File opened in read only mode.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Autoreload Request</source>
+        <source>Lock Database?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The database file has changed. Do you want to load the changes?</source>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge Request</source>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot; өзгертілген.
+Өзгерістерді сақтау керек пе?</translation>
+    </message>
+    <message>
+        <source>Database was modified.
+Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
+        <source>Save changes?</source>
+        <translation>Өзгерістерді сақтау керек пе?</translation>
+    </message>
+    <message>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
+        <source>Disable safe saves?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty recycle bin?</source>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
+        <source>Writing the database failed.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passwords</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save database as</source>
+        <translation>Дерекқорды қалайша сақтау</translation>
+    </message>
+    <message>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 дерекқоры</translation>
+    </message>
+    <message>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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>
+    </message>
+    <message>
+        <source>Delete group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database was not modified by merge operation.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -767,6 +1676,30 @@ Do you want to open it anyway?</source>
         <translation>Тарихы</translation>
     </message>
     <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Entry history</source>
         <translation>Жазба тарихы</translation>
     </message>
@@ -787,22 +1720,8 @@ Do you want to open it anyway?</source>
         <translation>Жаңа атрибут</translation>
     </message>
     <message>
-        <source>Select file</source>
-        <translation>Файлды таңдау</translation>
-    </message>
-    <message>
-        <source>Unable to open file</source>
-        <translation>Файлды ашу мүмкін емес</translation>
-    </message>
-    <message>
-        <source>Save attachment</source>
-        <translation>Салынымды сақтау</translation>
-    </message>
-    <message>
-        <source>Unable to save the attachment:
-</source>
-        <translation>Салынымды сақтау мүмкін емес:
-</translation>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tomorrow</source>
@@ -810,30 +1729,42 @@ Do you want to open it anyway?</source>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n апта</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation><numerusform>%n ай</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Apply generated password?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 жыл</translation>
+        <source>Do you want to apply the generated password to this entry?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Confirm Remove</source>
+        <source>Entry updated successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Are you sure you want to remove this attribute?</source>
+        <source>Entry has unsaved changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <source>[PROTECTED] Press reveal to view or edit</source>
         <translation type="unfinished"/>
     </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
-        <source>Are you sure you want to remove this attachment?</source>
+        <source>Confirm Removal</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -852,27 +1783,27 @@ Do you want to open it anyway?</source>
         <translation>Өшіру</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Салынымдар</translation>
+        <source>Edit Name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save</source>
-        <translation>Сақтау</translation>
+        <source>Protect</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open</source>
-        <translation>Ашу</translation>
+        <source>Reveal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Edit Name</source>
-        <translation type="unfinished"/>
+        <source>Attachments</source>
+        <translation>Салынымдар</translation>
     </message>
     <message>
-        <source>Protect</source>
+        <source>Foreground Color:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Reveal</source>
+        <source>Background Color:</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -883,18 +1814,6 @@ Do you want to open it anyway?</source>
         <translation>Бұл жазба үшін автотеруді іске қосу</translation>
     </message>
     <message>
-        <source>+</source>
-        <translation>+</translation>
-    </message>
-    <message>
-        <source>-</source>
-        <translation>-</translation>
-    </message>
-    <message>
-        <source>Window title:</source>
-        <translation>Терезе атауы:</translation>
-    </message>
-    <message>
         <source>Inherit default Auto-Type sequence from the &amp;group</source>
         <translation type="unfinished"/>
     </message>
@@ -903,15 +1822,23 @@ Do you want to open it anyway?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use default se&amp;quence</source>
+        <source>Window Associations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Set custo&amp;m sequence:</source>
-        <translation type="unfinished"/>
+        <source>+</source>
+        <translation>+</translation>
     </message>
     <message>
-        <source>Window Associations</source>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <source>Window title:</source>
+        <translation>Терезе атауы:</translation>
+    </message>
+    <message>
+        <source>Use a specific sequence for this association:</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -937,12 +1864,8 @@ Do you want to open it anyway?</source>
 <context>
     <name>EditEntryWidgetMain</name>
     <message>
-        <source>Title:</source>
-        <translation>Атауы:</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Пайдаланушы аты:</translation>
+        <source>URL:</source>
+        <translation>URL:</translation>
     </message>
     <message>
         <source>Password:</source>
@@ -953,20 +1876,104 @@ Do you want to open it anyway?</source>
         <translation>Қайталау:</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <source>Title:</source>
+        <translation>Атауы:</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Мерзімі аяқталады</translation>
+        <source>Notes</source>
+        <translation>Естеліктер</translation>
     </message>
     <message>
         <source>Presets</source>
         <translation>Сақталған баптаулар</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation>Естеліктер:</translation>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>Пайдаланушы аты:</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Мерзімі аяқталады</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1005,6 +2012,81 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Пароль:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1038,6 +2120,14 @@ Do you want to open it anyway?</source>
 <context>
     <name>EditWidgetIcons</name>
     <message>
+        <source>&amp;Use default icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Add custom icon</source>
         <translation>Таңдауыңызша таңбашаны қосу</translation>
     </message>
@@ -1046,6 +2136,14 @@ Do you want to open it anyway?</source>
         <translation>Таңдауыңызша таңбашаны өшіру</translation>
     </message>
     <message>
+        <source>Download favicon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Images</source>
         <translation>Суреттер</translation>
     </message>
@@ -1054,44 +2152,44 @@ Do you want to open it anyway?</source>
         <translation>Барлық файлдар</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Суретті таңдау</translation>
-    </message>
-    <message>
-        <source>Download favicon</source>
+        <source>Custom icon already exists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to fetch favicon.</source>
+        <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t read icon</source>
+        <source>Custom icon successfully downloaded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Use default icon</source>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use custo&amp;m icon</source>
+        <source>Select Image(s)</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Confirm Delete</source>
-        <translation type="unfinished"/>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
+        <source>No icons were loaded</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation type="unfinished"/>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source>Custom icon already exists</source>
-        <translation type="unfinished"/>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1112,13 +2210,121 @@ Do you want to open it anyway?</source>
         <source>Uuid:</source>
         <translation>Uuid:</translation>
     </message>
+    <message>
+        <source>Plugin Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Өшіру</translation>
+    </message>
+    <message>
+        <source>Delete plugin data?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to delete the selected plugin data?
+This may cause the affected plugins to malfunction.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
+        <source>%1 - Clone</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Аты</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Қосу</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Өшіру</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Ашу</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Сақтау</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm remove</source>
         <translation type="unfinished"/>
     </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
+%1</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
 </context>
 <context>
     <name>EntryAttributesModel</name>
@@ -1149,6 +2355,11 @@ Do you want to open it anyway?</source>
 <context>
     <name>EntryModel</name>
     <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Group</source>
         <translation>Топ</translation>
     </message>
@@ -1165,8 +2376,166 @@ Do you want to open it anyway?</source>
         <translation>URL</translation>
     </message>
     <message>
-        <source>Ref: </source>
-        <comment>Reference abbreviation</comment>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Пароль</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Естеліктер</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Мерзімі аяқталады</translation>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Accessed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Салынымдар</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Жалпы</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Пайдаланушы аты</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Пароль</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Салынымдар</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Естеліктер</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Терезе</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Тізбек</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Іздеу</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryView</name>
+    <message>
+        <source>Customize View</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide Usernames</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide Passwords</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fit to window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fit to contents</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reset to defaults</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments (icon)</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1176,66 +2545,421 @@ Do you want to open it anyway?</source>
         <source>Recycle Bin</source>
         <translation>Қоқыс шелегі</translation>
     </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
+    <name>GroupModel</name>
     <message>
-        <source>Length:</source>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>HostInstaller</name>
     <message>
-        <source>Character Types</source>
-        <translation>Таңбалар түрлері</translation>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Upper Case Letters</source>
-        <translation>Бас әріптер</translation>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KMessageWidget</name>
     <message>
-        <source>A-Z</source>
+        <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lower Case Letters</source>
-        <translation>Кіші әріптер</translation>
+        <source>Close message</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Kdbx3Reader</name>
     <message>
-        <source>a-z</source>
+        <source>Unable to calculate master key</source>
+        <translation>Басты парольді есептеу мүмкін емес</translation>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Numbers</source>
-        <translation>Сандар</translation>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>Пароль қате, немесе дерекқор файлы зақымдалған.</translation>
     </message>
     <message>
-        <source>0-9</source>
+        <source>missing database headers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Special Characters</source>
-        <translation>Арнайы таңбалар</translation>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>/*_&amp; ...</source>
+        <source>Invalid header id size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Ұқсайтын таңбаларға жол бермеу</translation>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Ensure that the password contains characters from every group</source>
+        <source>Invalid header data length</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>KMessageWidget</name>
+    <name>Kdbx3Writer</name>
     <message>
-        <source>&amp;Close</source>
+        <source>Unable to issue challenge-response.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Close message</source>
+        <source>Unable to calculate master key</source>
+        <translation>Басты парольді есептеу мүмкін емес</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Басты парольді есептеу мүмкін емес</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Басты парольді есептеу мүмкін емес</translation>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1269,6 +2993,35 @@ Do you want to open it anyway?</source>
         <translation>KeePass дерекқоры нұсқасына қолдау жоқ.</translation>
     </message>
     <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Root</source>
         <translation>Түбір</translation>
     </message>
@@ -1280,82 +3033,295 @@ Do you want to open it anyway?</source>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Пароль қате, немесе дерекқор файлы зақымдалған.</translation>
     </message>
-</context>
-<context>
-    <name>KeePass2Reader</name>
     <message>
-        <source>Not a KeePass database.</source>
-        <translation>KeePass дерекқоры емес.</translation>
+        <source>Key transformation failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
-        <translation>KeePass дерекқоры нұсқасына қолдау жоқ.</translation>
+        <source>Invalid group field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
-        <translation>Пароль қате, немесе дерекқор файлы зақымдалған.</translation>
+        <source>Invalid group field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Басты парольді есептеу мүмкін емес</translation>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to issue challenge-response.</source>
+        <source>Incorrect group id field size</source>
         <translation type="unfinished"/>
     </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>
+        <source>Incorrect group creation time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group modification time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group expiry time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group level field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group field type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing group id or level</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing entry field type number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry modification time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry field type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unable to seek to content position</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>KeePass2Writer</name>
+    <name>KeeShare</name>
     <message>
-        <source>Unable to issue challenge-response.</source>
+        <source>Disabled share</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Басты парольді есептеу мүмкін емес</translation>
+        <source>Import from</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Криптографиялық функцияларды сынау кезіндегі қатаң қате орын алды.</translation>
+        <source>Key Component</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
+        <source>Key Component Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
+        <source>Key Component set, click to change or remove</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>Шолу</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Кілттер файлдары</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Барлық файлдар</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Кілттер файлын жасау...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Кілттер файлын таңдаңыз</translation>
+    </message>
+</context>
+<context>
     <name>MainWindow</name>
     <message>
-        <source>Open database</source>
-        <translation>Дерекқорды ашу</translation>
+        <source>&amp;Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Recent databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>E&amp;ntries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Tools</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;About</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Open database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Save database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Close database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Delete entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Edit group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Delete group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sa&amp;ve database as...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database settings</source>
         <translation>Дерекқор баптаулары</translation>
     </message>
     <message>
+        <source>&amp;Clone entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Copy username to clipboard</source>
         <translation>Пайдаланушы атын алмасу буферіне көшіріп алу</translation>
     </message>
@@ -1364,362 +3330,503 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Парольді алмасу буферіне көшіріп алу</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Баптаулар</translation>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password Generator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Lock databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy title to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy URL to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy notes to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Export to CSV file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Set up TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>E&amp;mpty recycle bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show toolbar</source>
-        <translation>Саймандар панелін көрсету</translation>
+        <source>Access error for config file %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>read-only</source>
-        <translation>тек оқу</translation>
+        <source>Settings</source>
+        <translation>Баптаулар</translation>
     </message>
     <message>
         <source>Toggle window</source>
         <translation>Терезені көрсету/жасыру</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 дерекқоры</translation>
+        <source>Quit KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Барлық файлдар</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Жөнделген дерекқорды сақтау</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Дерекқорды жазу сәтсіз аяқталды.</translation>
+        <source>&amp;Donate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Recent databases</source>
+        <source>Report a &amp;bug</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>E&amp;ntries</source>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
+        <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Groups</source>
+        <source>Copy att&amp;ribute...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;View</source>
+        <source>TOTP...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Quit</source>
+        <source>&amp;New database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;About</source>
+        <source>Create a new database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Save database</source>
+        <source>&amp;Merge from database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Close database</source>
+        <source>Merge from another KDBX database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;New database</source>
+        <source>&amp;New entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge from KeePassX database</source>
+        <source>Add a new entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Add new entry</source>
+        <source>&amp;Edit entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;View/Edit entry</source>
+        <source>View or edit entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Delete entry</source>
+        <source>&amp;New group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Add new group</source>
+        <source>Add a new group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Edit group</source>
+        <source>Change master &amp;key...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Delete group</source>
+        <source>&amp;Database settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Database settings</source>
+        <source>Copy &amp;password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Clone entry</source>
+        <source>Perform &amp;Auto-Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Timed one-time password</source>
+        <source>Open &amp;URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
+        <source>KeePass 1 database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show TOTP</source>
+        <source>Import a KeePass 1 database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Find</source>
+        <source>CSV file...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy &amp;username</source>
+        <source>Import a CSV file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
+        <source>Show TOTP...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Settings</source>
+        <source>Show TOTP QR Code...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
+        <source>Check for Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Open URL</source>
+        <source>Share entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Lock databases</source>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Title</source>
+        <source>Check for updates on startup?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;URL</source>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Notes</source>
+        <source>You can always check for updates manually from the application menu.</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Merger</name>
     <message>
-        <source>Password Generator</source>
+        <source>Creating missing %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear history</source>
+        <source>Relocating %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Database</source>
+        <source>Overwriting %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import</source>
+        <source>older entry merged from database &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Tools</source>
+        <source>Adding backup for older target %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty recycle bin</source>
+        <source>Adding backup for older source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Quit KeePassXC</source>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
+        <source>Synchronizing from newer source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Help</source>
+        <source>Synchronizing from older source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Open database...</source>
+        <source>Deleting child %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sa&amp;ve database as...</source>
+        <source>Deleting orphan %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
+        <source>Changed deleted objects</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Export to CSV file...</source>
+        <source>Adding missing icon %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Түбір</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
+        <source>En&amp;cryption Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import CSV file...</source>
+        <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"/>
     </message>
     <message>
-        <source>Re&amp;pair database...</source>
+        <source>Advanced Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Set up TOTP...</source>
+        <source>Simple Settings</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>NewDatabaseWizardPageEncryption</name>
     <message>
-        <source>Dialog</source>
+        <source>Encryption Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Жалпы</translation>
+        <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"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <source>A master key known only to you protects your database.</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
     <message>
-        <source>Sort matching entries by &amp;username</source>
+        <source>General Database Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <source>Please fill in the display name and an optional description for your new database:</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Advanced</source>
-        <translation>Кеңейтілген</translation>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
+        <source>PEM boundary mismatch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
+        <source>Base64 decoding failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <source>Key file way too small.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
+        <source>Key file magic header id invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
+        <source>Found zero keys</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <source>Failed to read public key.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
+        <source>Corrupted key file, reading private key failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <source>No private key payload to decrypt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
+        <source>Trying to run KDF without cipher</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
+        <source>Passphrase is required to decrypt this key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
+        <source>Key derivation failed, key file corrupted?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <source>Decryption failed, wrong passphrase?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
+        <source>Unexpected EOF while reading public key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
+        <source>Unexpected EOF while reading private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enable KeePassHTTP server</source>
+        <source>Can&apos;t write public key as it is empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <source>Unexpected EOF when writing public key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return only best matching entries</source>
+        <source>Can&apos;t write private key as it is empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
+        <source>Unexpected EOF when writing private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Match URL schemes</source>
+        <source>Unsupported key type: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password Generator</source>
+        <source>Unknown cipher: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only the selected database has to be connected with a client.</source>
+        <source>Cipher IV is too short for MD5 kdf</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown KDF: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The following options can be dangerous!
-Change them only if you know what you are doing.</source>
+        <source>Unknown key type: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PasswordEditWidget</name>
+    <message>
+        <source>Enter password:</source>
+        <translation>Парольді енгізіңіз:</translation>
+    </message>
+    <message>
+        <source>Confirm password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Пароль</translation>
+    </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"/>
+    </message>
+    <message>
+        <source>Password cannot be empty.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passwords do not match.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate master password</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
     <message>
+        <source>%p%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Password:</source>
         <translation>Пароль:</translation>
     </message>
     <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Пароль</translation>
+    </message>
+    <message>
         <source>Character Types</source>
         <translation>Таңбалар түрлері</translation>
     </message>
@@ -1740,43 +3847,43 @@ Change them only if you know what you are doing.</source>
         <translation>Арнайы таңбалар</translation>
     </message>
     <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Ұқсайтын таңбаларға жол бермеу</translation>
+        <source>Extended ASCII</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Accept</source>
-        <translation>Қабылдау</translation>
+        <source>Exclude look-alike characters</source>
+        <translation>Ұқсайтын таңбаларға жол бермеу</translation>
     </message>
     <message>
-        <source>%p%</source>
+        <source>Pick characters from every group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>strength</source>
+        <source>&amp;Length:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>entropy</source>
+        <source>Passphrase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Length:</source>
+        <source>Wordlist:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Pick characters from every group</source>
+        <source>Word Separator:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Generate</source>
+        <source>Copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="unfinished"/>
+        <source>Accept</source>
+        <translation>Қабылдау</translation>
     </message>
     <message>
-        <source>Apply</source>
+        <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1789,74 +3896,429 @@ Change them only if you know what you are doing.</source>
     </message>
     <message>
         <source>Poor</source>
+        <comment>Password quality</comment>
         <translation type="unfinished"/>
     </message>
     <message>
         <source>Weak</source>
+        <comment>Password quality</comment>
         <translation type="unfinished"/>
     </message>
     <message>
         <source>Good</source>
+        <comment>Password quality</comment>
         <translation type="unfinished"/>
     </message>
     <message>
         <source>Excellent</source>
+        <comment>Password quality</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Пароль</translation>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extended ASCII</source>
+        <source>Switch to advanced mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase</source>
+        <source>Advanced</source>
+        <translation>Кеңейтілген</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist:</source>
+        <source>A-Z</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Count:</source>
+        <source>Lower Case Letters A to F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Separator:</source>
+        <source>a-z</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
+        <source>0-9</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Өшіру</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Өшіру</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Сөндіру</translation>
+    </message>
+    <message>
+        <source>Merge</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>NULL device</source>
+        <source>Database not opened</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>error reading from device</source>
+        <source>Database hash not available</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Client public key not received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot decrypt message</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>file empty !
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>malformed string</source>
+        <source>Name of the command to execute.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>missing closing quote</source>
+        <source>List database entries.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>NULL device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>INTERNAL - unget lower bound exceeded</source>
+        <source>error reading from device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>malformed string</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>missing closing quote</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1876,14 +4338,18 @@ Change them only if you know what you are doing.</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
-    </message>
-    <message>
         <source>Notes</source>
         <translation>Естеліктер</translation>
     </message>
     <message>
+        <source>Last Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Browser Integration</source>
         <translation type="unfinished"/>
     </message>
@@ -1899,6 +4365,461 @@ Change them only if you know what you are doing.</source>
         <source>Passive</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new random diceware passphrase.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word count for the diceware passphrase.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wordlist for the diceware generator.
+[Default: EFF English]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new random password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>таңдауыңызша баптаулар файлына дейінгі жол</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>дерекқордың кілттер файлы</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Криптографиялық функцияларды сынау кезіндегі қатаң қате орын алды.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -1935,309 +4856,373 @@ Change them only if you know what you are doing.</source>
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
     <message>
-        <source>Case Sensitive</source>
+        <source>Agent connection failed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Іздеу</translation>
+        <source>Agent protocol error.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear</source>
+        <source>No agent running, cannot add identity.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Search...</source>
+        <source>No agent running, cannot remove identity.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Limit search to selected group</source>
+        <source>Agent refused this identity. Possible reasons include:</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Service</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
+        <source>The key has already been added.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
+        <source>A confirmation request is not supported by the agent (check options).</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
     <message>
-        <source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source>
+        <source>Search Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <source>Every search term must match (ie, logical AND)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
+        <source>Modifiers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
+        <source>exclude term from results</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Successfully removed permissions from %1 %2.</source>
+        <source>match term exactly</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
+        <source>use regex in term</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: New key association request</source>
+        <source>Fields</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
+        <source>Term Wildcards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
+        <source>match anything</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
+        <source>match one</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
+        <source>logical OR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
+        <source>Examples</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SearchWidget</name>
     <message>
-        <source>KeePassXC: No keys found</source>
+        <source>Search</source>
+        <translation>Іздеу</translation>
+    </message>
+    <message>
+        <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
+        <source>Limit search to selected group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
+        <source>Search Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Case sensitive</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SettingsWidget</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>Application Settings</source>
-        <translation>Қолданба баптаулары</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Жалпы</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>Қауіпсіздік</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
+        <source>Own certificate</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Remember last databases</source>
-        <translation>Соңғы дерекқорларды есте сақтау:</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>Шығу кезінде автосақтау</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>Әр өзгерістен кейін автосақтау</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>Алмасу буферіне көшіру кезінде қолданбаны қайыру</translation>
+        <source>Key:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>Жазбаны жасау кезінде топ таңбашасын қолдану</translation>
+        <source>Generate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Глобалды автотеру жарлығы</translation>
+        <source>Import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Тіл</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>Жүйелік трей таңбашасын қолдану</translation>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>Қолданба қайырылған кезде терезені жүйелік трейге жасыру</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
+        <source>Ask</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically reload the database when modified externally</source>
+        <source>Untrust</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
+        <source>Remove</source>
+        <translation>Өшіру</translation>
+    </message>
+    <message>
+        <source>Path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
+        <source>Status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Basic Settings</source>
+        <source>Fingerprint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
+        <source>Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <source>Trusted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Автотеру</translation>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title and URL to match windows for global Auto-Type</source>
+        <source>Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
+        <source>KeeShare key file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
+        <source>All files</source>
+        <translation>Барлық файлдар</translation>
+    </message>
+    <message>
+        <source>Select path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SettingsWidgetSecurity</name>
+    <name>ShareObserver</name>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>Алмасу буферін тазалау алдындағы кідіріс</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <translation>сек</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>Дерекқорларды белсенділік жоқ кезде блоктау алдындағы кідіріс</translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Парольдерді үнсіз келісім бойынша ашық мәтінмен көрсету</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
+        <source>Not this time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
+        <source>Never</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Timeouts</source>
+        <source>Always</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
+        <source>Just this time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
+        <source>Import from %1 failed (%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Privacy</source>
+        <source>Import from %1 successful (%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
+        <source>Imported from %1</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SetupTotpDialog</name>
     <message>
-        <source>Setup TOTP</source>
+        <source>Signed share container are not supported - import prevented</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key:</source>
+        <source>File is not readable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use custom settings</source>
+        <source>Invalid sharing container</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
+        <source>Untrusted import prevented</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Time step:</source>
+        <source>Successful signed import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>8 digits</source>
+        <source>Unexpected error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>6 digits</source>
+        <source>Unsigned share container are not supported - import prevented</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Code size:</source>
+        <source>Successful unsigned import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <translation>сек</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2254,137 +5239,185 @@ give it a unique name to identify and accept it.</source>
         <source>Copy</source>
         <translation type="unfinished"/>
     </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <source>Expires in</source>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
+        <source>There was an error creating the QR code.</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>Дерекқорды блоктаудан босату</translation>
+        <source>Closing in %1 seconds.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>WelcomeWidget</name>
+    <name>TotpSetupDialog</name>
     <message>
-        <source>Welcome to KeePassXC</source>
+        <source>Setup TOTP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start storing your passwords securely in a KeePassXC database</source>
+        <source>Key:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Create new database</source>
+        <source>Default RFC 6238 token settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open existing database</source>
+        <source>Steam token settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import from KeePass 1</source>
+        <source>Use custom settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import from CSV</source>
+        <source>Custom Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Recent databases</source>
+        <source>Time step:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>сек</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>6 digits</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>7 digits</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>8 digits</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>main</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>path to a custom config file</source>
-        <translation>таңдауыңызша баптаулар файлына дейінгі жол</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>дерекқордың кілттер файлы</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - cross-platform password manager</source>
+        <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
+        <source>Update Error!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
+        <source>An error occurred in retrieving update information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy a password to the clipboard</source>
+        <source>Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Path of the database.</source>
+        <source>Software Update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use a GUI prompt unlocking the database.</source>
+        <source>A new version of KeePassXC is available!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Name of the entry to clip.</source>
+        <source>KeePassXC %1 is now available — you have %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extract and print the content of a database.</source>
+        <source>Download it at keepassxc.org</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Path of the database to extract.</source>
+        <source>You&apos;re up-to-date!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Name of the command to execute.</source>
+        <source>KeePassXC %1 is currently the newest version available</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>WelcomeWidget</name>
     <message>
-        <source>List database entries.</source>
+        <source>Start storing your passwords securely in a KeePassXC database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Path of the group to list. Default is /</source>
+        <source>Create new database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Print the UUIDs of the entries and groups.</source>
+        <source>Open existing database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge two databases.</source>
+        <source>Import from KeePass 1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Path of the database to merge into.</source>
+        <source>Import from CSV</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Path of the database to merge from.</source>
+        <source>Recent databases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use the same password for both database files.</source>
+        <source>Welcome to KeePassXC %1</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>Show a password.</source>
+        <source>Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Name of the entry to show.</source>
+        <source>YubiKey Challenge-Response</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No YubiKey inserted.</source>
         <translation type="unfinished"/>
     </message>
 </context>
diff --git a/share/translations/keepassx_ko.ts b/share/translations/keepassx_ko.ts
index 6b7bfc849..d39b0ff00 100644
--- a/share/translations/keepassx_ko.ts
+++ b/share/translations/keepassx_ko.ts
@@ -38,12 +38,6 @@
         <translation>클립보드에 복사</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>버전 %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>리비전: %1</translation>
     </message>
@@ -76,34 +70,48 @@ CPU 아키텍처: %2
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
+        <source>Version %1</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP 접근 확인</translation>
+        <source>Build Type: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>이 선택 기억하기</translation>
+        <source>Auto-Type</source>
+        <translation>자동 입력</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>허용</translation>
+        <source>Browser Integration</source>
+        <translation>브라우저 통합</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>거부</translation>
+        <source>SSH Agent</source>
+        <translation>SSH 에이전트</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>%1에서 다음 항목의 암호를 요청했습니다.
-접근을 허용할 지 여부를 선택하십시오.</translation>
+        <source>YubiKey</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -112,6 +120,277 @@ Please select whether you want to allow access.</source>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>SSH 에이전트 사용(다시 시작 필요)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>프로그램 설정</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>일반</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>보안</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>설정 파일 %1에 접근할 수 없음</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>기본 설정</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>시작</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>KeePassXC 단일 인스턴스만 사용</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>마지막 데이터베이스 기억</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>마지막 키 파일과 보안 동글 기억</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>시작할 때 이전 데이터베이스 불러오기</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>프로그램 시작 시 창 최소화</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>파일 관리</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation>데이터베이스 파일 안전 저장(Dropbox 등과 호환되지 않을 수 있음)</translation>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation>저장하기 전에 데이터베이스 파일 백업</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>항목을 변경할 때 자동 저장</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>끝낼 때 자동 저장</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>데이터가 변경되지 않았을 때 데이터베이스를 수정된 것으로 표시하지 않음(예: 그룹 확장)</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>외부에서 데이터베이스를 수정했을 때 자동으로 새로 고침</translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>항목 관리</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>항목을 만들 때 그룹 아이콘 사용</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>클립보드에 복사할 때 최소화</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>일반</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>시스템 트레이 아이콘 표시</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>어두운 시스템 트레이 아이콘</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>시스템 트레이로 최소화</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>언어</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>자동 입력</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>전역 자동 입력 시 창 제목을 항목 제목에서 검색</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>전역 자동 입력 시 창 제목을 항목 URL에서 검색</translation>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>자동 입력 시 항상 묻기</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>전역 자동 입력 단축키</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation>ms</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>시간 제한</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>다음 시간 이후 클립보드 비우기</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>초</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>다음 시간 동안 활동이 없을 때 데이터베이스 잠금</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>편의성</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>세션이 잠겼을 때나 덮개를 닫았을 때 데이터베이스 잠금</translation>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>창을 최소화할 때 데이터베이스 잠금</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>암호가 보일 때 반복하지 않음</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>기본값으로 암호 숨기기</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>개인 정보</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -215,6 +494,26 @@ Please select whether you want to allow access.</source>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>취소</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -288,14 +587,6 @@ Please select whether you want to allow access.</source>
         <translation>사용자 이름 순으로 일치하는 항목 정렬(&amp;U)</translation>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>모든 브라우저 연결 해제(&amp;D)</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>모든 기억한 권한 잊기(&amp;P)</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>고급</translation>
     </message>
@@ -361,19 +652,36 @@ Please select whether you want to allow access.</source>
         <translation>&lt;b&gt;경고:&lt;/b&gt; 다음 옵션은 신중하게 사용하십시오!</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>실행 파일 (*.exe);;모든 파일(*.*)</translation>
+        <source>Select custom proxy location</source>
+        <translation>사용자 정의 프록시 위치 지정</translation>
     </message>
     <message>
-        <source>Executable Files (*)</source>
-        <translation>실행 파일 (*)</translation>
+        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Select custom proxy location</source>
-        <translation>사용자 정의 프록시 위치 지정</translation>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
+        <source>&amp;Tor Browser</source>
+        <translation type="unfinished"/>
+    </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: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not ask permission for HTTP &amp;Basic Auth</source>
+        <extracomment>An extra HTTP Basic Auth setting</extracomment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -416,152 +724,43 @@ Do you want to overwrite it?</source>
         <translation>%1 - %2의 정보를 업데이트하시겠습니까?</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: 데이터베이스 잠김!</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>활성 데이터베이스가 잠겨 있습니다!
-선택한 데이터베이스의 잠금을 풀거나 잠금이 풀린 데이터베이스를 선택하십시오.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: 설정을 사용할 수 없음!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation>활성 데이터베이스에 설정 항목이 없습니다.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: 키를 찾을 수 없음</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation>KeePassXC 설정에서 공유 암호화 키를 찾을 수 없습니다.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: 데이터베이스에서 키 삭제됨</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation><numerusform>KeePassXC 설정에서 암호화 키 %n개를 삭제했습니다.</numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>저장된 권한 삭제 중...</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>중지</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: 권한 삭제됨</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation><numerusform>항목 %n개에 저장된 권한을 삭제했습니다.</numerusform></translation>
-    </message>
-    <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: 권한이 있는 항목을 찾을 수 없음!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>활성 데이터베이스에 권한이 부여된 항목이 없습니다.</translation>
-    </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>암호</translation>
-    </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>암호 입력:</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>암호 확인:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>키 파일(&amp;K)</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>찾아보기</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>만들기</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>질의 응답(&amp;L)</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>새로 고침</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>키 파일</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>모든 파일</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>키 파일 만들기...</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>키 파일을 만들 수 없습니다: </translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>키 파일 선택</translation>
+        <source>Converting attributes to custom data…</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty password</source>
-        <translation>빈 암호</translation>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>빈 문자열을 암호로 사용하시겠습니까?</translation>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>다른 암호를 입력하였습니다.</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>%1을(를) 키 파일로 설정할 수 없습니다: %2</translation>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Legacy key file format</source>
-        <translation>레거시 키 파일 형식</translation>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation type="unfinished"/>
     </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>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>마스터 키를 변경할 수 없음: YubiKey가 없습니다.</translation>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -642,14 +841,6 @@ Please consider generating a new key file.</source>
         <translation>CSV 파일에 없음</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>빈 필드 이름 </translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>칸 </translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>CSV 파일에서 가져옴</translation>
     </message>
@@ -658,48 +849,84 @@ Please consider generating a new key file.</source>
         <translation>원본 데이터: </translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>CSV 파일에 오류가 있습니다!</translation>
+        <source>Error</source>
+        <translation>오류</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation>개 메시지 더 건너뜀]</translation>
+        <source>Empty fieldname %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>오류</translation>
+        <source>column %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>CSV 가져오기: 기록 중 오류 발생:
-</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>오류</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>마스터 키를 계산할 수 없습니다</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
-        <translation><numerusform>%n 바이트, </numerusform></translation>
+        <source>%n column(s)</source>
+        <translation><numerusform>%n칸</numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
-        <translation><numerusform>%n줄, </numerusform></translation>
+        <source>%n byte(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
-        <translation><numerusform>%n칸</numerusform></translation>
+        <source>%n row(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>루트</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -729,14 +956,6 @@ Please consider generating a new key file.</source>
         <translation>질의 응답:</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>데이터베이스를 열 수 없습니다.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>키 파일을 열 수 없음</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation>레거시 키 파일 형식</translation>
     </message>
@@ -766,106 +985,169 @@ Please consider generating a new key file.</source>
         <source>Select key file</source>
         <translation>키 파일 선택</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>데이터베이스 복구</translation>
+        <source>TouchID for quick unlock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>오류</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>키 파일을 열 수 없음</translation>
+        <source>Can't open key file:
+%1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>데이터베이스를 열 수 없습니다.</translation>
+        <source>Passwords</source>
+        <translation>암호</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
+    <message>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>데이터베이스를 열었습니다. 할 일이 없습니다.</translation>
+        <source>General</source>
+        <translation>일반</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>보안</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>성공</translation>
+        <source>Master Key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>데이터베이스를 복구했습니다
-이제 저장할 수 있습니다.</translation>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>데이터베이스를 복구할 수 없습니다.</translation>
+        <source>Browser Integration</source>
+        <translation>브라우저 통합</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>일반</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>암호화</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>모든 브라우저 연결 해제(&amp;D)</translation>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
-        <translation>라운드 수가 너무 높음</translation>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation type="unfinished"/>
     </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>Argon2 키 변형 라운드 수가 너무 높습니다.
-
-해당 수치를 사용하면 데이터베이스를 열 때 수 시간이나 수 일 이상 소요될 수 있습니다!</translation>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Understood, keep number</source>
-        <translation>이해함, 숫자 유지</translation>
+        <source>Stored keys</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>취소</translation>
+        <source>Remove</source>
+        <translation>삭제</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
-        <translation>라운드 수가 너무 낮음</translation>
+        <source>Delete the selected key?</source>
+        <translation type="unfinished"/>
     </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>AES-KDF 키 변형 라운드 수가 너무 낮습니다.
-
-해당 수치를 계속 사용하면 데이터베이스의 보안을 쉽게 해제할 수 있습니다!</translation>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KDF unchanged</source>
-        <translation>키 유도 함수 변경되지 않음</translation>
+        <source>Key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
-        <translation>새로운 키 유도 함수 인자로 키를 변경할 수 없어서 키 유도 함수를 변경하지 않았습니다.</translation>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: 키를 찾을 수 없음</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: 데이터베이스에서 키 삭제됨</translation>
     </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>저장된 권한 삭제 중...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>중지</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: 권한 삭제됨</translation>
+    </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
+        <source>Successfully removed permissions from %n entry(s).</source>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: 권한이 있는 항목을 찾을 수 없음!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>활성 데이터베이스에 권한이 부여된 항목이 없습니다.</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetEncryption</name>
@@ -901,6 +1183,113 @@ If you keep this number, your database may be too easy to crack!</source>
         <source>Parallelism:</source>
         <translation>스레드 수:</translation>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>라운드 수가 너무 높음</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>Argon2 키 변형 라운드 수가 너무 높습니다.
+
+해당 수치를 사용하면 데이터베이스를 열 때 수 시간이나 수 일 이상 소요될 수 있습니다!</translation>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation>이해함, 숫자 유지</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>취소</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>라운드 수가 너무 낮음</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>AES-KDF 키 변형 라운드 수가 너무 낮습니다.
+
+해당 수치를 계속 사용하면 데이터베이스의 보안을 쉽게 해제할 수 있습니다!</translation>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation>키 유도 함수 변경되지 않음</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation>새로운 키 유도 함수 인자로 키를 변경할 수 없어서 키 유도 함수를 변경하지 않았습니다.</translation>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -950,90 +1339,110 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>루트</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 데이터베이스</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>모든 파일</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>데이터베이스 열기</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>파일을 찾을 수 없습니다!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>데이터베이스를 열 수 없습니다.</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>파일을 읽기 전용 모드로 열었습니다.</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>CSV 파일 열기</translation>
+        <source>Add additional protection...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>CSV 파일</translation>
+        <source>No encryption key added</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>모든 파일 (*)</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>데이터베이스 합치기</translation>
+        <source>No password set</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>KeePass 1 데이터베이스 열기</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 type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1 데이터베이스</translation>
+        <source>Unknown error</source>
+        <translation>알 수 없는 오류</translation>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>닫기 확인?</translation>
+        <source>Failed to change master key</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot;이(가) 현재 편집 모드입니다.
-변경 사항을 무시하고 닫으시겠습니까?</translation>
+        <source>Database Name:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>변경 사항 저장 확인?</translation>
+        <source>Description:</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>&quot;%1&quot;이(가) 변경되었습니다. 저장하시겠습니까?</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 데이터베이스</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>데이터베이스에 쓸 수 없습니다.</translation>
+        <source>All files</source>
+        <translation>모든 파일</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>암호</translation>
+        <source>Open database</source>
+        <translation>데이터베이스 열기</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>다른 이름으로 데이터베이스 저장</translation>
+        <source>CSV file</source>
+        <translation>CSV 파일</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>데이터베이스 합치기</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>KeePass 1 데이터베이스 열기</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 데이터베이스</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1044,40 +1453,40 @@ Save changes?</source>
         <translation>CSV 파일에 기록할 수 없습니다.</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>새 데이터베이스</translation>
+        <source>Database creation error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>locked</source>
-        <translation>잠김</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 type="unfinished"/>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>데이터베이스 잠금</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>데이터베이스를 편집하고 있어서 잠글 수 없습니다.
-취소를 눌러서 변경 사항을 저장하거나 무시하십시오.</translation>
+        <source>Select CSV file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>데이터베이스가 수정되었습니다.
-잠그기 전에 데이터베이스를 저장하시겠습니까?
-저장하지 않은 변경 사항은 손실됩니다.</translation>
+        <source>New Database</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disable safe saves?</source>
-        <translation>안전 저장을 비활성화 하시겠습니까?</translation>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
     </message>
     <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에서 데이터베이스를 여러 번 저장하려고 시도했으나 실패했습니다. 파일 동기화 서비스에서 데이터베이스 파일을 잠근 것 같습니다.
-안전 저장을 비활성화 한 다음 다시 시도하시겠습니까?</translation>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1087,37 +1496,13 @@ Disable safe saves and try again?</source>
         <translation>찾는 중...</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>마스터 키 변경</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>항목을 삭제하시겠습니까?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>정말 항목 &quot;%1&quot;을(를) 삭제하시겠습니까?</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>항목을 삭제하시겠습니까?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>정말 항목 %1개를 삭제하시겠습니까?</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>항목을 휴지통으로 이동하시겠습니까?</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation>항목 &quot;%1&quot;을(를) 휴지통으로 이동하시겠습니까?</translation>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>항목을 휴지통으로 이동하시겠습니까?</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation><numerusform>항목 %n개를 휴지통으로 이동하시겠습니까?</numerusform></translation>
@@ -1135,18 +1520,10 @@ Disable safe saves and try again?</source>
         <translation>이 선택 기억하기</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>그룹을 삭제하시겠습니까?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>정말 그룹 &quot;%1&quot;을(를) 삭제하시겠습니까?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>마스터 키를 계산할 수 없습니다</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>현재 데이터베이스가 없습니다.</translation>
     </message>
@@ -1181,10 +1558,6 @@ Do you want to merge your changes?</source>
 변경 사항을 합치겠습니까?</translation>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>이 데이터베이스를 자동으로 다시 불러오는 중 새 데이터베이스를 열 수 없습니다.</translation>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>휴지통을 비우시겠습니까?</translation>
     </message>
@@ -1192,88 +1565,103 @@ Do you want to merge your changes?</source>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>휴지통에 있는 항목을 영원히 삭제하시겠습니까?</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>TOTP 토큰 생성</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>닫기</translation>
+        <source>File opened in read only mode.</source>
+        <translation>파일을 읽기 전용 모드로 열었습니다.</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>일반</translation>
+        <source>Lock Database?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password</source>
-        <translation>암호</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot;이(가) 변경되었습니다. 저장하시겠습니까?</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>만료</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Username</source>
-        <translation>사용자 이름</translation>
+        <source>Save changes?</source>
+        <translation>변경 사항 저장 확인?</translation>
     </message>
     <message>
-        <source>Autotype</source>
-        <translation>자동 입력</translation>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>찾기</translation>
+        <source>Disable safe saves?</source>
+        <translation>안전 저장을 비활성화 하시겠습니까?</translation>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>속성</translation>
+        <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에서 데이터베이스를 여러 번 저장하려고 시도했으나 실패했습니다. 파일 동기화 서비스에서 데이터베이스 파일을 잠근 것 같습니다.
+안전 저장을 비활성화 한 다음 다시 시도하시겠습니까?</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>첨부</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>메모</translation>
+        <source>Passwords</source>
+        <translation>암호</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>창</translation>
+        <source>Save database as</source>
+        <translation>다른 이름으로 데이터베이스 저장</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>시퀀스</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 데이터베이스</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>찾기</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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></translation>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>비우기</translation>
+        <source>Delete group</source>
+        <translation>그룹 삭제</translation>
     </message>
     <message>
-        <source>Never</source>
-        <translation>하지 않음</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[보호됨]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>사용 안함</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>사용함</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1347,22 +1735,10 @@ Do you want to merge your changes?</source>
         <translation>새 속성</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>삭제 확인</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>이 속성을 삭제하시겠습니까?</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[보호됨]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation>보거나 편집하려면 누르십시오</translation>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>내일</translation>
     </message>
@@ -1375,10 +1751,6 @@ Do you want to merge your changes?</source>
         <translation><numerusform>%n개월</numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1년</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation type="unfinished"/>
     </message>
@@ -1390,6 +1762,26 @@ Do you want to merge your changes?</source>
         <source>Entry updated successfully.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation>[보호됨] 보거나 편집하려면 누르십시오</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1635,6 +2027,81 @@ Do you want to merge your changes?</source>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>폼</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>암호:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1692,10 +2159,6 @@ Do you want to merge your changes?</source>
         <translation>파비콘을 다운로드할 수 없습니다.</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>힌트: 도구 &gt; 설정 &gt; 보안에서 Google을 대체 항목으로 사용할 수 있습니다</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>그림</translation>
     </message>
@@ -1704,14 +2167,6 @@ Do you want to merge your changes?</source>
         <translation>모든 파일</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>그림 선택</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read icon</source>
-        <translation>아이콘을 읽을 수 없음</translation>
-    </message>
-    <message>
         <source>Custom icon already exists</source>
         <translation>사용자 정의 아이콘이 이미 존재함</translation>
     </message>
@@ -1720,8 +2175,36 @@ Do you want to merge your changes?</source>
         <translation>삭제 확인</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>이 아이콘을 항목 %1개에서 사용하고 있으며, 삭제 시 기본 아이콘으로 대체됩니다. 그래도 삭제하시겠습니까?</translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1771,9 +2254,8 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation> - 사본</translation>
+        <source>%1 - Clone</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1818,10 +2300,6 @@ This may cause the affected plugins to malfunction.</source>
         <translation><numerusform>첨부 항목 %n개를 삭제하시겠습니까?</numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>삭제 확인</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>첨부 항목 저장</translation>
     </message>
@@ -1858,10 +2336,13 @@ This may cause the affected plugins to malfunction.</source>
 %1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>파일을 열 수 없음:
-%1</translation>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1945,109 +2426,167 @@ This may cause the affected plugins to malfunction.</source>
         <source>Attachments</source>
         <translation>첨부</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>EntryView</name>
+    <name>EntryPreviewWidget</name>
     <message>
-        <source>Customize View</source>
-        <translation>보기 사용자 정의</translation>
+        <source>Generate TOTP Token</source>
+        <translation>TOTP 토큰 생성</translation>
     </message>
     <message>
-        <source>Hide Usernames</source>
-        <translation>사용자 이름 숨기기</translation>
+        <source>Close</source>
+        <translation>닫기</translation>
     </message>
     <message>
-        <source>Hide Passwords</source>
-        <translation>암호 숨기기</translation>
+        <source>General</source>
+        <translation>일반</translation>
     </message>
     <message>
-        <source>Fit to window</source>
-        <translation>창에 맞춤</translation>
+        <source>Username</source>
+        <translation>사용자 이름</translation>
     </message>
     <message>
-        <source>Fit to contents</source>
-        <translation>내용에 맞춤</translation>
+        <source>Password</source>
+        <translation>암호</translation>
     </message>
     <message>
-        <source>Reset to defaults</source>
-        <translation>기본값으로 복원</translation>
+        <source>Expiration</source>
+        <translation>만료</translation>
     </message>
     <message>
-        <source>Attachments (icon)</source>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>속성</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>첨부</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>메모</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>자동 입력</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>창</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>시퀀스</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>찾기</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>찾기</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>비우기</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>하지 않음</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[보호됨]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Group</name>
     <message>
-        <source>Recycle Bin</source>
-        <translation>휴지통</translation>
+        <source>Enabled</source>
+        <translation>사용함</translation>
     </message>
-</context>
-<context>
-    <name>HostInstaller</name>
     <message>
-        <source>KeePassXC: Cannot save file!</source>
-        <translation>KeePassXC: 파일을 저장할 수 없음!</translation>
+        <source>Disabled</source>
+        <translation>사용 안함</translation>
     </message>
     <message>
-        <source>Cannot save the native messaging script file.</source>
-        <translation>네이티브 메시징 스크립트 파일을 저장할 수 없습니다.</translation>
+        <source>Share</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>길이:</translation>
-    </message>
+    <name>EntryView</name>
     <message>
-        <source>Character Types</source>
-        <translation>문자 종류</translation>
+        <source>Customize View</source>
+        <translation>보기 사용자 정의</translation>
     </message>
     <message>
-        <source>Upper Case Letters</source>
-        <translation>대문자</translation>
+        <source>Hide Usernames</source>
+        <translation>사용자 이름 숨기기</translation>
     </message>
     <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
+        <source>Hide Passwords</source>
+        <translation>암호 숨기기</translation>
     </message>
     <message>
-        <source>Lower Case Letters</source>
-        <translation>소문자</translation>
+        <source>Fit to window</source>
+        <translation>창에 맞춤</translation>
     </message>
     <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
+        <source>Fit to contents</source>
+        <translation>내용에 맞춤</translation>
     </message>
     <message>
-        <source>Numbers</source>
-        <translation>숫자</translation>
+        <source>Reset to defaults</source>
+        <translation>기본값으로 복원</translation>
     </message>
     <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
+        <source>Attachments (icon)</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Group</name>
     <message>
-        <source>Special Characters</source>
-        <translation>특수 문자</translation>
+        <source>Recycle Bin</source>
+        <translation>휴지통</translation>
     </message>
     <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>GroupModel</name>
     <message>
-        <source>Exclude look-alike characters</source>
-        <translation>비슷하게 생긴 문자 제외</translation>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>HostInstaller</name>
     <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>모든 그룹에서 최소 1글자 이상 포함</translation>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation>KeePassXC: 파일을 저장할 수 없음!</translation>
     </message>
     <message>
-        <source>Extended ASCII</source>
-        <translation>확장 ASCII</translation>
+        <source>Cannot save the native messaging script file.</source>
+        <translation>네이티브 메시징 스크립트 파일을 저장할 수 없습니다.</translation>
     </message>
 </context>
 <context>
@@ -2075,6 +2614,26 @@ This may cause the affected plugins to malfunction.</source>
         <source>Wrong key or database file is corrupt.</source>
         <translation>키가 잘못되었거나 데이터베이스가 손상되었습니다.</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation>데이터베이스 헤더 없음</translation>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>잘못된 헤더 ID 크기</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>잘못된 헤더 필드 길이</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>잘못된 헤더 데이터 길이</translation>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2234,10 +2793,6 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation>잘못됨 암호화 UUID 길이</translation>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation>지원하지 않는 암호화</translation>
     </message>
@@ -2291,6 +2846,18 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Unsupported KeePass 2 database version.</source>
         <translation>지원하지 않는 KeePass 2 데이터베이스 버전입니다.</translation>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2363,10 +2930,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>다른 UUID를 사용하는 과거 기록 원소</translation>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation>항목 문자열을 복호화할 수 없음</translation>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation>중복된 사용자 정의 속성이 있음</translation>
     </message>
@@ -2415,6 +2978,12 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation>바이너리 압축을 해제할 수 없음</translation>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2578,28 +3147,126 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Invalid entry field type</source>
         <translation>잘못된 항목 필드 크기</translation>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>존재하는 단일 인스턴스 잠금 파일이 잘못되었습니다. 새 인스턴스를 실행합니다.</translation>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>잠금 파일을 만들 수 없습니다. 단일 인스턴스 모드가 비활성화되었습니다.</translation>
+        <source>Import from</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>다른 KeePassXC 인스턴스가 이미 실행 중입니다.</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>암호화 함수를 시험하는 중 오류가 발생하였습니다.</translation>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - 오류</translation>
+        <source>Key Component</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>취소</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>찾아보기</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>생성</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>키 파일</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>모든 파일</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>키 파일 만들기...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>키 파일 선택</translation>
     </message>
 </context>
 <context>
@@ -2613,10 +3280,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>최근 데이터베이스(&amp;R)</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>가져오기</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation>도움말(&amp;H)</translation>
     </message>
@@ -2625,14 +3288,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>항목(&amp;N)</translation>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>속성을 클립보드에 복사(&amp;R)</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation>시간 기반 일회용 암호</translation>
-    </message>
-    <message>
         <source>&amp;Groups</source>
         <translation>그룹(&amp;G)</translation>
     </message>
@@ -2661,30 +3316,10 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>데이터베이스 닫기(&amp;C)</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>새 데이터베이스(&amp;N)</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>KeePassX 데이터베이스에서 합치기</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>새 항목 추가(&amp;A)</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>항목 보기/편집(&amp;V)</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>항목 삭제(&amp;D)</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>새 그룹 추가(&amp;A)</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>그룹 편집(&amp;E)</translation>
     </message>
@@ -2697,14 +3332,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>다른 이름으로 데이터베이스 저장(&amp;V)...</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>마스터 키 변경(&amp;M)...</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>데이터베이스 설정(&amp;D)</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>데이터베이스 설정</translation>
     </message>
@@ -2713,10 +3340,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>항목 복제(&amp;C)</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>찾기(&amp;F)</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>사용자 이름 복사(&amp;U)</translation>
     </message>
@@ -2725,10 +3348,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>클립보드에 사용자 이름 복사</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>암호 복사(&amp;Y)</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>클립보드에 암호 복사</translation>
     </message>
@@ -2741,14 +3360,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>암호 생성기</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation>자동 입력 실행(&amp;P)</translation>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>URL 열기(&amp;O)</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>데이터베이스 잠금(&amp;L)</translation>
     </message>
@@ -2781,22 +3392,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>CSV 파일로 내보내기(&amp;E)...</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>KeePass1 데이터베이스 가져오기...</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>CSV 파일 가져오기...</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>데이터베이스 복구(&amp;P)...</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>TOTP 보이기</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>TOTP 설정...</translation>
     </message>
@@ -2817,14 +3412,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>설정 파일 %1에 접근할 수 없음</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation>&lt;p&gt;KeePassHTTP 브라우저 통합을 사용하고 있는 것 같습니다. 이 기능은 폐기 예고되었고 차후에 삭제될 예정입니다.&lt;br&gt;KeePassXC-브라우저로 교체하십시오! 이전 작업에 도움이 필요하면 &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;이전 가이드&lt;/a&gt;를 참고하십시오(경고 %1/3).&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>읽기 전용</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>설정</translation>
     </message>
@@ -2837,257 +3424,407 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>KeePassXC 끝내기</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 데이터베이스</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>YubiKey의 단추를 누르십시오!</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>모든 파일</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation>경고: KeePassXC 불안정 빌드를 사용하고 있습니다!
+데이터베이스 파일이 잘못될 가능성이 높으므로 항상 데이터베이스를 백업하십시오.
+이 버전은 실제 환경에서 사용을 가정하지 않습니다.</translation>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>데이터베이스 열기</translation>
+        <source>&amp;Donate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>복구한 데이터베이스 저장</translation>
+        <source>Report a &amp;bug</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>데이터베이스에 쓸 수 없습니다.</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>YubiKey의 단추를 누르십시오!</translation>
+        <source>&amp;Import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
-        <translation>경고: KeePassXC 불안정 빌드를 사용하고 있습니다!
-데이터베이스 파일이 잘못될 가능성이 높으므로 항상 데이터베이스를 백업하십시오.
-이 버전은 실제 환경에서 사용을 가정하지 않습니다.</translation>
+        <source>Copy att&amp;ribute...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>OpenSSHKey</name>
+    <name>Merger</name>
     <message>
-        <source>Invalid key file, expecting an OpenSSH key</source>
-        <translation>잘못된 키 파일, OpenSSH 키가 필요함</translation>
+        <source>Creating missing %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>PEM boundary mismatch</source>
-        <translation>PEM 경계가 일치하지 않음</translation>
+        <source>Relocating %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Base64 decoding failed</source>
-        <translation>Base64 디코드 실패</translation>
+        <source>Overwriting %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key file way too small.</source>
-        <translation>키 파일이 너무 작습니다.</translation>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key file magic header id invalid</source>
-        <translation>키 파일 매직 헤더 ID가 잘못됨</translation>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Found zero keys</source>
-        <translation>키를 찾을 수 없음</translation>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to read public key.</source>
-        <translation>공개 키를 읽을 수 없습니다.</translation>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Corrupted key file, reading private key failed</source>
-        <translation>키 파일이 잘못됨, 비밀 키를 읽을 수 없음</translation>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>No private key payload to decrypt</source>
-        <translation>암호화 해제할 비밀 키 페이로드가 없음</translation>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Trying to run KDF without cipher</source>
-        <translation>키 유도 함수를 암호화 없이 실행하려고 함</translation>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase is required to decrypt this key</source>
-        <translation>이 키를 복호화하려면 암호가 필요함</translation>
+        <source>Deleting child %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key derivation failed, key file corrupted?</source>
-        <translation>키 유도 실패, 키 파일이 유효합니까?</translation>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Decryption failed, wrong passphrase?</source>
-        <translation>복호화 실패, 암호가 올바릅니까?</translation>
+        <source>Changed deleted objects</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unexpected EOF while reading public key</source>
-        <translation>공개 키를 읽는 중 예상하지 못한 곳에서 파일이 끝남</translation>
+        <source>Adding missing icon %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
     <message>
-        <source>Unexpected EOF while reading private key</source>
-        <translation>비밀 키를 읽는 중 예상하지 못한 곳에서 파일이 끝남</translation>
+        <source>Create a new KeePassXC database...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t write public key as it is empty</source>
-        <translation>공개 키가 비어 있어서 기록할 수 없음</translation>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>루트</translation>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
     <message>
-        <source>Unexpected EOF when writing public key</source>
-        <translation>공개 키를 기록하는 중 예상하지 못한 곳에서 파일이 끝남</translation>
+        <source>WizardPage</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t write private key as it is empty</source>
-        <translation>비밀 키가 비어 있어서 기록할 수 없음</translation>
+        <source>En&amp;cryption Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unexpected EOF when writing private key</source>
-        <translation>비밀 키를 기록하는 중 예상하지 못한 곳에서 파일이 끝남</translation>
+        <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"/>
     </message>
     <message>
-        <source>Unsupported key type: %1</source>
+        <source>Advanced Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unknown cipher: %1</source>
+        <source>Simple Settings</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
     <message>
-        <source>Cipher IV is too short for MD5 kdf</source>
+        <source>Encryption Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unknown KDF: %1</source>
+        <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"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
     <message>
-        <source>Unknown key type: %1</source>
+        <source>Database Master Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>NewDatabaseWizardPageMetaData</name>
     <message>
-        <source>Dialog</source>
-        <translation>대화 상자</translation>
+        <source>General Database Information</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>ChromeIPass나 PassIFox에서 데이터베이스에 접근하려면 필요합니다</translation>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>KeePassHTTP 서버 사용</translation>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation>잘못된 키 파일, OpenSSH 키가 필요함</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>일반</translation>
+        <source>PEM boundary mismatch</source>
+        <translation>PEM 경계가 일치하지 않음</translation>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>인증 정보가 필요할 때 알림 표시(&amp;O)</translation>
+        <source>Base64 decoding failed</source>
+        <translation>Base64 디코드 실패</translation>
     </message>
     <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>도메인이 일치하는 모든 항목 대신 지정한 URL과 일치하는 항목만 반환합니다.</translation>
+        <source>Key file way too small.</source>
+        <translation>키 파일이 너무 작습니다.</translation>
     </message>
     <message>
-        <source>&amp;Return only best matching entries</source>
-        <translation>URL과 일치하는 항목만 반환(&amp;R)</translation>
+        <source>Key file magic header id invalid</source>
+        <translation>키 파일 매직 헤더 ID가 잘못됨</translation>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>데이터베이스가 잠겼을 때 잠금 해제 요청(&amp;Q)</translation>
+        <source>Found zero keys</source>
+        <translation>키를 찾을 수 없음</translation>
     </message>
     <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation>같은 스키마(http://, https://, ftp://)를 사용하는 항목만 반환합니다.</translation>
+        <source>Failed to read public key.</source>
+        <translation>공개 키를 읽을 수 없습니다.</translation>
     </message>
     <message>
-        <source>&amp;Match URL schemes</source>
-        <translation>URL 스키마 일치(&amp;M)</translation>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation>키 파일이 잘못됨, 비밀 키를 읽을 수 없음</translation>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>사용자 이름 순으로 일치하는 항목 정렬(&amp;U)</translation>
+        <source>No private key payload to decrypt</source>
+        <translation>암호화 해제할 비밀 키 페이로드가 없음</translation>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>제목 순으로 일치하는 항목 정렬(&amp;M)</translation>
+        <source>Trying to run KDF without cipher</source>
+        <translation>키 유도 함수를 암호화 없이 실행하려고 함</translation>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>활성 데이터베이스에 있는 모든 공유된 암호화 키 삭제(&amp;E)</translation>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation>이 키를 복호화하려면 암호가 필요함</translation>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>활성 데이터베이스에 있는 항목에서 모든 저장된 권한 삭제(&amp;M)</translation>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation>키 유도 실패, 키 파일이 유효합니까?</translation>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>암호 생성기</translation>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation>복호화 실패, 암호가 올바릅니까?</translation>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>고급</translation>
+        <source>Unexpected EOF while reading public key</source>
+        <translation>공개 키를 읽는 중 예상하지 못한 곳에서 파일이 끝남</translation>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>항상 항목 접근 허용(&amp;A)</translation>
+        <source>Unexpected EOF while reading private key</source>
+        <translation>비밀 키를 읽는 중 예상하지 못한 곳에서 파일이 끝남</translation>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>항상 항목 업데이트 허용(&amp;U)</translation>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation>공개 키가 비어 있어서 기록할 수 없음</translation>
     </message>
     <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>선택한 데이터베이스만 클라이언트와 연결할 수 있습니다.</translation>
+        <source>Unexpected EOF when writing public key</source>
+        <translation>공개 키를 기록하는 중 예상하지 못한 곳에서 파일이 끝남</translation>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>모든 열린 데이터베이스에서 일치하는 항목 검색(&amp;H)</translation>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation>비밀 키가 비어 있어서 기록할 수 없음</translation>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>문자열 필드를 자동으로 만들거나 업데이트하는 것은 지원되지 않습니다.</translation>
+        <source>Unexpected EOF when writing private key</source>
+        <translation>비밀 키를 기록하는 중 예상하지 못한 곳에서 파일이 끝남</translation>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>&quot;KPH: &quot;로 시작하는 고급 문자열 필드 반환(&amp;R)</translation>
+        <source>Unsupported key type: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP 포트:</translation>
+        <source>Unknown cipher: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>기본 포트: 19455</translation>
+        <source>Cipher IV is too short for MD5 kdf</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC는 127.0.0.1의 다음 포트에서 응답을 기다립니다</translation>
+        <source>Unknown KDF: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;경고:&lt;/b&gt; 다음 옵션은 신중하게 사용하십시오!</translation>
+        <source>Unknown key type: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PasswordEditWidget</name>
+    <message>
+        <source>Enter password:</source>
+        <translation>암호 입력:</translation>
+    </message>
+    <message>
+        <source>Confirm password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>암호</translation>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;KeePassHTTP는 폐기 예고되었고 차후에 삭제될 예정입니다.&lt;br&gt;KeePassXC-브라우저로 교체하십시오! 이전 작업에 도움이 필요하면 &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;이전 가이드&lt;/a&gt;를 참고하십시오.&lt;/p&gt;</translation>
+        <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"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>권한 있는 포트에 바인드할 수 없음</translation>
+        <source>Password cannot be empty.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>1024 이하의 권한이 필요한 포트에 바인드할 수 없습니다!
-기본 포트 19455를 사용합니다.</translation>
+        <source>Passwords do not match.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate master password</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3158,18 +3895,10 @@ Using default port 19455.</source>
         <translation>단어 목록:</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>단어 개수:</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>단어 구분자:</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>생성</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>복사</translation>
     </message>
@@ -3182,10 +3911,6 @@ Using default port 19455.</source>
         <translation>닫기</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>적용</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>엔트로피: %1비트</translation>
     </message>
@@ -3213,6 +3938,171 @@ Using default port 19455.</source>
         <comment>Password quality</comment>
         <translation>매우 좋음</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>고급</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>삭제</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>삭제</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>비활성화</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3233,34 +4123,18 @@ Using default port 19455.</source>
         <translation>메시지를 복호화할 수 없음</translation>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
-        <translation>KeePassXC에 연결할 수 없거나 시간 초과됨</translation>
-    </message>
-    <message>
         <source>Action cancelled or denied</source>
         <translation>접근이 취소되었거나 거부됨</translation>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation>메시지를 암호화할 수 없거나 비밀 키를 찾을 수 없습니다. KeePassXC 네이티브 메시징이 활성화되어 있습니까?</translation>
-    </message>
-    <message>
         <source>KeePassXC association failed, try again</source>
         <translation>KeePassXC 연결 실패, 다시 시도하십시오</translation>
     </message>
     <message>
-        <source>Key change was not successful</source>
-        <translation>키 교환 실패</translation>
-    </message>
-    <message>
         <source>Encryption key is not recognized</source>
         <translation>암호화 키를 인식할 수 없음</translation>
     </message>
     <message>
-        <source>No saved databases found</source>
-        <translation>저장된 데이터베이스를 찾을 수 없음</translation>
-    </message>
-    <message>
         <source>Incorrect action</source>
         <translation>잘못된 동작</translation>
     </message>
@@ -3386,10 +4260,6 @@ Using default port 19455.</source>
         <translation>%1의 잠금 해제 암호 입력: </translation>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation>키 파일 %1을(를) 불러올 수 없음: %2</translation>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3474,12 +4344,6 @@ Available commands:
         <translation>장치에서 읽는 중 오류 발생</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>파일이 비어 있습니다!
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation>잘못된 문자열</translation>
     </message>
@@ -3488,30 +4352,6 @@ Available commands:
         <translation>닫는 따옴표 없음</translation>
     </message>
     <message>
-        <source>AES: 256-bit</source>
-        <translation>AES: 256비트</translation>
-    </message>
-    <message>
-        <source>Twofish: 256-bit</source>
-        <translation>Twofish: 256비트</translation>
-    </message>
-    <message>
-        <source>ChaCha20: 256-bit</source>
-        <translation>ChaCha20: 256비트</translation>
-    </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2(KDBX 4 – 추천)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 4)</source>
-        <translation>AES-KDF(KDBX 4)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 3.1)</source>
-        <translation>AES-KDF(KDBX 3.1)</translation>
-    </message>
-    <message>
         <source>Group</source>
         <translation>그룹</translation>
     </message>
@@ -3540,10 +4380,6 @@ Available commands:
         <translation>생성</translation>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
-        <translation>레거시 브라우저 통합</translation>
-    </message>
-    <message>
         <source>Browser Integration</source>
         <translation>브라우저 통합</translation>
     </message>
@@ -3572,40 +4408,446 @@ Available commands:
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Wordlist for the diceware generator.
+[Default: EFF English]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new random password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>count</source>
+        <comment>CLI parameter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist for the diceware generator.
-[Default: EFF English]</source>
+        <source>Invalid value for password length: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Generate a new random password.</source>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Length of the generated password.</source>
+        <source>Multi-word extra bits %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
+        <source>Type: Bruteforce</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
+        <source>Type: Dictionary</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
+        <source>Type: Dict+Leet</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
+        <source>Type: User Words</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256비트</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256비트</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256비트</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2(KDBX 4 – 추천)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF(KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF(KDBX 3.1)</translation>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>데이터베이스에서 항목을 삭제합니다.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>삭제할 항목의 경로입니다.</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>존재하는 단일 인스턴스 잠금 파일이 잘못되었습니다. 새 인스턴스를 실행합니다.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>잠금 파일을 만들 수 없습니다. 단일 인스턴스 모드가 비활성화되었습니다.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - 크로스 플랫폼 암호 관리자</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>열 암호 데이터베이스 파일 이름(*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>사용자 정의 설정 파일 경로</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>데이터베이스 키 파일</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>표준 입력에서 데이터베이스 암호 읽기</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation>부모 창 핸들</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>다른 KeePassXC 인스턴스가 이미 실행 중입니다.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>암호화 함수를 시험하는 중 오류가 발생하였습니다.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - 오류</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -3644,11 +4886,97 @@ Available commands:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
+    <message>
+        <source>Agent connection failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <source>Search...</source>
-        <translation>찾기...</translation>
+        <source>Examples</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SearchWidget</name>
     <message>
         <source>Search</source>
         <translation>찾기</translation>
@@ -3658,314 +4986,316 @@ Available commands:
         <translation>비우기</translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation>대소문자 구분</translation>
-    </message>
-    <message>
         <source>Limit search to selected group</source>
         <translation>지정한 그룹에서만 찾기</translation>
     </message>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation>대소문자 구분</translation>
+    </message>
 </context>
 <context>
-    <name>Service</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC: 새 키 연결 요청</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation>위에 있는 키의 연결 요청을 받았습니다.
-해딩 키에서 KeePassXC 데이터베이스 접근을 허용하려면
-식별할 수 있는 이름을 부여한 후 수락하십시오.</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: 기존 키를 덮어쓰시겠습니까?</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>이름이 &quot;%1&quot;인 공유 암호화 키가 이미 있습니다.
-덮어쓰시겠습니까?</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: 항목 업데이트</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>%1 - %2의 정보를 업데이트하시겠습니까?</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: 데이터베이스 잠김!</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>활성 데이터베이스가 잠겨 있습니다!
-선택한 데이터베이스의 잠금을 풀거나 잠금이 풀린 데이터베이스를 선택하십시오.</translation>
+        <source>Key:</source>
+        <translation>키:</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: 데이터베이스에서 키 삭제됨</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation><numerusform>KeePassX/HTTP 설정에서 암호화 키 %n개를 삭제했습니다.</numerusform></translation>
+        <source>Generate</source>
+        <translation>생성</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: 키를 찾을 수 없음</translation>
+        <source>Import</source>
+        <translation>가져오기</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>KeePassHttp 설정에서 공유 암호화 키를 찾을 수 없습니다.</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: 설정을 사용할 수 없음!</translation>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>활성 데이터베이스에 KeePassHttp 설정 항목이 없습니다.</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>저장된 권한 삭제 중...</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>중지</translation>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: 권한 삭제됨</translation>
+        <source>Remove</source>
+        <translation>삭제</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation><numerusform>항목 %n개에 저장된 권한을 삭제했습니다.</numerusform></translation>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: 권한이 있는 항목을 찾을 수 없음!</translation>
+        <source>Status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>활성 데이터베이스에 권한이 부여된 항목이 없습니다.</translation>
+        <source>Fingerprint</source>
+        <translation>지문</translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
-        <translation>프로그램 설정</translation>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>일반</translation>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>보안</translation>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>설정 파일 %1에 접근할 수 없음</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>기본 설정</translation>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>KeePassXC 단일 인스턴스만 사용</translation>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>마지막 데이터베이스 기억</translation>
+        <source>All files</source>
+        <translation>모든 파일</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>마지막 키 파일과 보안 동글 기억</translation>
+        <source>Select path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>시작할 때 이전 데이터베이스 불러오기</translation>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>끝낼 때 자동 저장</translation>
+        <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"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>항목을 변경할 때 자동 저장</translation>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>외부에서 데이터베이스를 수정했을 때 자동으로 새로 고침</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>클립보드에 복사할 때 최소화</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>프로그램 시작 시 창 최소화</translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>항목을 만들 때 그룹 아이콘 사용</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>데이터가 변경되지 않았을 때 데이터베이스를 수정된 것으로 표시하지 않음(예: 그룹 확장)</translation>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
-        <translation>자세히 보기 숨기기</translation>
+        <source>Never</source>
+        <translation>하지 않음</translation>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>시스템 트레이 아이콘 표시</translation>
+        <source>Always</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>시스템 트레이로 최소화</translation>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
-        <translation>프로그램을 끝내지 않고 시스템 트레이로 창 숨기기</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
-        <translation>어두운 시스템 트레이 아이콘</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>언어</translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>자동 입력</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>전역 자동 입력 시 창 제목을 항목 제목에서 검색</translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>전역 자동 입력 시 창 제목을 항목 URL에서 검색</translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation>자동 입력 시 항상 묻기</translation>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>전역 자동 입력 단축키</translation>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>자동 입력 지연 시간</translation>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation>ms</translation>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
-        <translation>시작</translation>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
-        <translation>파일 관리</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation>데이터베이스 파일 안전 저장(Dropbox 등과 호환되지 않을 수 있음)</translation>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
-        <translation>저장하기 전에 데이터베이스 파일 백업</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
-        <translation>항목 관리</translation>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>일반</translation>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
-        <translation>시간 제한</translation>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>다음 시간 이후 클립보드 비우기</translation>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>초</translation>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>다음 시간 동안 활동이 없을 때 데이터베이스 잠금</translation>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>편의성</translation>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>세션이 잠겼을 때나 덮개를 닫았을 때 데이터베이스 잠금</translation>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>창을 최소화할 때 데이터베이스 잠금</translation>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>TotpDialog</name>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>암호가 보일 때 반복하지 않음</translation>
+        <source>Timed Password</source>
+        <translation>시간 제한된 암호</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>기본값으로 암호를 평문으로 표시</translation>
+        <source>000000</source>
+        <translation>000000</translation>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
-        <translation>미리 보기 패널에서 암호 숨기기</translation>
+        <source>Copy</source>
+        <translation>복사</translation>
     </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
     <message>
-        <source>Hide entry notes by default</source>
-        <translation>기본값으로 암호 숨기기</translation>
+        <source>Copy</source>
+        <translation>복사</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>개인 정보</translation>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>웹 사이트 아이콘의 대체 아이콘으로 Google 사용</translation>
+        <source>There was an error creating the QR code.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <source>Closing in %1 seconds.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation>TOTP 설정</translation>
@@ -3987,59 +5317,84 @@ Please unlock the selected database or choose another one which is unlocked.</so
         <translation>사용자 정의 설정 사용</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>메모: 무엇을 하는 지 알고 있는 경우에만 이 설정을 변경하십시오.</translation>
+        <source>Custom Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Time step:</source>
         <translation>시간 단계:</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8자리</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>초</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>코드 크기:</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6자리</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>코드 크기:</translation>
+        <source>7 digits</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>초</translation>
+        <source>8 digits</source>
+        <translation>8자리</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>시간 제한된 암호</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>복사</translation>
+        <source>Close</source>
+        <translation>닫기</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>만료 시간</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>초</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>데이터베이스 잠금 해제</translation>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4074,42 +5429,26 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
 </context>
 <context>
-    <name>main</name>
-    <message>
-        <source>Remove an entry from the database.</source>
-        <translation>데이터베이스에서 항목을 삭제합니다.</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>데이터베이스의 경로입니다.</translation>
-    </message>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>Path of the entry to remove.</source>
-        <translation>삭제할 항목의 경로입니다.</translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - 크로스 플랫폼 암호 관리자</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>열 암호 데이터베이스 파일 이름(*.kdbx)</translation>
+        <source>Refresh</source>
+        <translation>새로 고침</translation>
     </message>
     <message>
-        <source>path to a custom config file</source>
-        <translation>사용자 정의 설정 파일 경로</translation>
+        <source>YubiKey Challenge-Response</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>데이터베이스 키 파일</translation>
+        <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"/>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>표준 입력에서 데이터베이스 암호 읽기</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Parent window handle</source>
-        <translation>부모 창 핸들</translation>
+        <source>No YubiKey inserted.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_la.ts b/share/translations/keepassx_la.ts
new file mode 100644
index 000000000..cf9c711bb
--- /dev/null
+++ b/share/translations/keepassx_la.ts
@@ -0,0 +1,5427 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="la" version="2.1">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <source>About KeePassXC</source>
+        <translation>De KeePassXC</translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation>De</translation>
+    </message>
+    <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation>Nuntia errores ad: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
+    </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>KeepPassXC distributum est secundum GNU Generalem Publicam Licentiam (GPL) vel versionem 2 vel (ad libitum) versionem 3.</translation>
+    </message>
+    <message>
+        <source>Contributors</source>
+        <translation>Contributores</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>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Vide Contributiones in GitHub&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>Debug Info</source>
+        <translation>Depurationis Informatio</translation>
+    </message>
+    <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation>Includa informationem sequentem quandoque errorem nuntias:</translation>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>Exscribe ad aream transferendi</translation>
+    </message>
+    <message>
+        <source>Revision: %1</source>
+        <translation>Revisio: %1</translation>
+    </message>
+    <message>
+        <source>Distribution: %1</source>
+        <translation>Distributio: %1</translation>
+    </message>
+    <message>
+        <source>Libraries:</source>
+        <translation>Bibliotechae:</translation>
+    </message>
+    <message>
+        <source>Operating system: %1
+CPU architecture: %2
+Kernel: %3 %4</source>
+        <translation>Systema operationis: %1
+CPU architectura: %2
+Nucleus: %3 %4</translation>
+    </message>
+    <message>
+        <source>Enabled extensions:</source>
+        <translation>Extensiones habilitatae:</translation>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation>Manutentores Projecti:</translation>
+    </message>
+    <message>
+        <source>Special thanks from the KeePassXC team go to debfx for creating the original KeePassX.</source>
+        <translation>Egregias gratias ab KeePassXC Manus agunt ad debfx quod origniale KeepasX creavit.</translation>
+    </message>
+    <message>
+        <source>Version %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Build Type: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Auto-Scribe</translation>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation>Integratio cum Navigatore</translation>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>YubiKey</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
+    <message>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation>Habilita SSH Agentem (reinitium postulat)</translation>
+    </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Applicationis optiones</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Generale</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Securitas</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Optiones simplices</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Memento ultimas datorum bases </translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Memento ultima archiva claviaria et donglia securitatis</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Generale</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Lingua</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Auto-Scribe</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation> ms</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> sec</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>Noli tesseram iterum intrandam postulare cum visibilis est</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AutoType</name>
+    <message>
+        <source>Couldn&apos;t find an entry that matches the window title:</source>
+        <translation>Non potest invenire nomen quod cum titulo fenestrae congruit.</translation>
+    </message>
+    <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>Auto-Scribe - KeePassXC</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Auto-Scribe</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation>Syntaxis Auto-Type sententiae est mendosa!</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation>Hic Auto-Type iussus habet moram nimis longam. Num procedere vis?</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation>Hic Auto-Type iussus habet clavium pressus nimis tardos. Num procedere vis?</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation>Hic Auto-Type iussus habet argumenta quae nimis saepe repetuntur. Num procedere vis?</translation>
+    </message>
+</context>
+<context>
+    <name>AutoTypeAssociationsModel</name>
+    <message>
+        <source>Window</source>
+        <translation>Fenestra</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Sequentia</translation>
+    </message>
+    <message>
+        <source>Default sequence</source>
+        <translation>Sequentia defalta</translation>
+    </message>
+</context>
+<context>
+    <name>AutoTypeMatchModel</name>
+    <message>
+        <source>Group</source>
+        <translation>Classis</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Titulus</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Nomen usuari</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Sequentia</translation>
+    </message>
+</context>
+<context>
+    <name>AutoTypeSelectDialog</name>
+    <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>Auto-Scribe - KeePassXC</translation>
+    </message>
+    <message>
+        <source>Select entry to Auto-Type:</source>
+        <translation>Selige nomen ad Auto-Type:</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
+    <message>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation>KeePassXC-Navigator Confirme Accessus</translation>
+    </message>
+    <message>
+        <source>Remember this decision</source>
+        <translation>Memento hanc decisionem</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>Permitte</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Nega</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"/>
+    </message>
+</context>
+<context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Dialogus</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation>Necesse est hoc ut datorum bases KeePassXC-Navigatore accediantur.</translation>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation>Habilita Integrationem cum KeePassXC Navigatore</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Generale</translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation>Habilita integrationem pro his navigatoribus:</translation>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation type="unfinished"/>
+    </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: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not ask permission for HTTP &amp;Basic Auth</source>
+        <extracomment>An extra HTTP Basic Auth setting</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>Clavis cryptographica communa nomine &quot;%1&quot; iam existit.
+Visne eam suprascribere?</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Converting attributes to custom data…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CloneDialog</name>
+    <message>
+        <source>Clone Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Replace username and password with references</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy history</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CsvImportWidget</name>
+    <message>
+        <source>Import CSV fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>filename</source>
+        <translation>archivo nomen</translation>
+    </message>
+    <message>
+        <source>size, rows, columns</source>
+        <translation>dimensio, ordines, columnae</translation>
+    </message>
+    <message>
+        <source>Encoding</source>
+        <translation>Codificatio</translation>
+    </message>
+    <message>
+        <source>Codec</source>
+        <translation>Codec</translation>
+    </message>
+    <message>
+        <source>Text is qualified by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fields are separated by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comments start with</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>First record has field names</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of headers line to discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Consider &apos;\&apos; an escape character</source>
+        <translation>Imputa &apos;\&apos; characterem effugiendi</translation>
+    </message>
+    <message>
+        <source>Preview</source>
+        <translation>Praevisum</translation>
+    </message>
+    <message>
+        <source>Column layout</source>
+        <translation>Columnarum dispositio</translation>
+    </message>
+    <message>
+        <source>Not present in CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Imported from CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Original data: </source>
+        <translation>Originalia data:</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <source>Empty fieldname %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>column %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error(s) detected in CSV file!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CsvParserModel</name>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n byte(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n row(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Radix</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenWidget</name>
+    <message>
+        <source>Enter master key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key File:</source>
+        <translation>Archivum Claviare:</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse</source>
+        <translation>Naviga</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Archiva omnia</translation>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Archiva claviaria</translation>
+    </message>
+    <message>
+        <source>Select key file</source>
+        <translation>Selige archivum claviare</translation>
+    </message>
+    <message>
+        <source>TouchID for quick unlock</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can't open key file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
+    <message>
+        <source>Passwords</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
+    <message>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Generale</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Securitas</translation>
+    </message>
+    <message>
+        <source>Master Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation>Integratio cum Navigatore</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetBrowser</name>
+    <message>
+        <source>KeePassXC-Browser settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>&amp;Dejuga omnes navigatores</translation>
+    </message>
+    <message>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Stored keys</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Remove</translation>
+    </message>
+    <message>
+        <source>Delete the selected key?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation>Algorithmus cryptographicus</translation>
+    </message>
+    <message>
+        <source>AES:  256 Bit   (default)</source>
+        <translation>AES:  256 Bit   (defalta)</translation>
+    </message>
+    <message>
+        <source>Twofish:  256 Bit</source>
+        <translation>Twofish:  256 Bit</translation>
+    </message>
+    <message>
+        <source>Key Derivation Function:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>Nomen datorum basi:</translation>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation>Descriptio datorum basi:</translation>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation>Nomen usuari pro defalta</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation>Max. historica elementa:</translation>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation>Max. historiae magnitudo:</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation>MiB</translation>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Additional Database Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable &amp;compression (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetKeeShare</name>
+    <message>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
+    <message>
+        <source>Add additional protection...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No encryption key added</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No password set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to change master key</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
+    <message>
+        <source>Database Name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
+    <message>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 Datorum basem</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Archiva omnia</translation>
+    </message>
+    <message>
+        <source>Open database</source>
+        <translation>Aperi datorum basem</translation>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation>CSV archivum</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Aperi KeePass 1 datorum basem</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 datorum basis</translation>
+    </message>
+    <message>
+        <source>Export database to CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database creation error</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseWidget</name>
+    <message>
+        <source>Searching...</source>
+        <translation>Quaerens...</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Do you really want to move %n entry(s) to the recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Execute command?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember my choice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation>Visne classem &quot;%1&quot; sempiterne delere?</translation>
+    </message>
+    <message>
+        <source>No current database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No source database, nothing to do.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search Results (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No Results</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File has changed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The database file has changed. Do you want to load the changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
+        <translation type="unfinished"/>
+    </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>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>File opened in read only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock Database?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable safe saves?</source>
+        <translation>Visne secure servare debilitare?</translation>
+    </message>
+    <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 datorum basis servare aliquoties defecit. Causa probabiliter consistit in servitiis archiva synchronizandi tenentibus clausuram super archivum servatum.
+Visne secure servare debilitare et rursum conari?</translation>
+    </message>
+    <message>
+        <source>Writing the database failed.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passwords</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save database as</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 Datorum basem</translation>
+    </message>
+    <message>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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>
+    </message>
+    <message>
+        <source>Delete group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidget</name>
+    <message>
+        <source>Entry</source>
+        <translation>Nomen</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Icon</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Auto-Scribe</translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation>Proprietates</translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation>Historia</translation>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add entry</source>
+        <translation>Adde nomen</translation>
+    </message>
+    <message>
+        <source>Edit entry</source>
+        <translation>Muta nomen</translation>
+    </message>
+    <message>
+        <source>Different passwords supplied.</source>
+        <translation>Varia passwords data.</translation>
+    </message>
+    <message>
+        <source>New attribute</source>
+        <translation>Novum attributum</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Tomorrow</source>
+        <translation>Cras</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Apply generated password?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you want to apply the generated password to this entry?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry updated successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation>[PROTECTUM] Pressa &amp;apos;revela&amp;apos; ut videas aut mutes</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetAdvanced</name>
+    <message>
+        <source>Additional attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Adde</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Remove</translation>
+    </message>
+    <message>
+        <source>Edit Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Protect</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reveal</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Foreground Color:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Background Color:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetAutoType</name>
+    <message>
+        <source>Enable Auto-Type for this entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>+</source>
+        <translation>+</translation>
+    </message>
+    <message>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <source>Window title:</source>
+        <translation>Fenestrae titulus:</translation>
+    </message>
+    <message>
+        <source>Use a specific sequence for this association:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetHistory</name>
+    <message>
+        <source>Show</source>
+        <translation>Monstra</translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Dele</translation>
+    </message>
+    <message>
+        <source>Delete all</source>
+        <translation>Dele omnia</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetMain</name>
+    <message>
+        <source>URL:</source>
+        <translation>URL:</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Repeat:</source>
+        <translation>Itera:</translation>
+    </message>
+    <message>
+        <source>Title:</source>
+        <translation>Titulus</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notae</translation>
+    </message>
+    <message>
+        <source>Presets</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>Nomen usuari:</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Exspirat</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>Exscribe ad aream transferendi</translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditGroupWidget</name>
+    <message>
+        <source>Group</source>
+        <translation>Classis</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Icon</translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation>Proprietates</translation>
+    </message>
+    <message>
+        <source>Add group</source>
+        <translation>Adde classem</translation>
+    </message>
+    <message>
+        <source>Edit group</source>
+        <translation>Muta classem</translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation>Habilito</translation>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Dishabilito</translation>
+    </message>
+    <message>
+        <source>Inherit from parent group (%1)</source>
+        <translation>Heredita de classe parentali (%1)</translation>
+    </message>
+</context>
+<context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditGroupWidgetMain</name>
+    <message>
+        <source>Name</source>
+        <translation>Nomen</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notae</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Exspirat</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Quaere</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Auto-Scribe</translation>
+    </message>
+    <message>
+        <source>&amp;Use default Auto-Type sequence of parent group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Set default Auto-Type se&amp;quence</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditWidgetIcons</name>
+    <message>
+        <source>&amp;Use default icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add custom icon</source>
+        <translation>Adde iconem personalizatam</translation>
+    </message>
+    <message>
+        <source>Delete custom icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Download favicon</source>
+        <translation>Discarrica faviconem</translation>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Images</source>
+        <translation>Imagines</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Archiva omnia</translation>
+    </message>
+    <message>
+        <source>Custom icon already exists</source>
+        <translation>Icon personalizata iam existit</translation>
+    </message>
+    <message>
+        <source>Confirm Delete</source>
+        <translation>Confirma Deletionem</translation>
+    </message>
+    <message>
+        <source>Custom icon successfully downloaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>EditWidgetProperties</name>
+    <message>
+        <source>Created:</source>
+        <translation>Creatum:</translation>
+    </message>
+    <message>
+        <source>Modified:</source>
+        <translation>Mutatum:</translation>
+    </message>
+    <message>
+        <source>Accessed:</source>
+        <translation>Accessum:</translation>
+    </message>
+    <message>
+        <source>Uuid:</source>
+        <translation>Uuid:</translation>
+    </message>
+    <message>
+        <source>Plugin Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Remove</translation>
+    </message>
+    <message>
+        <source>Delete plugin data?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to delete the selected plugin data?
+This may cause the affected plugins to malfunction.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Entry</name>
+    <message>
+        <source>%1 - Clone</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Nomen</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Adde</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Remove</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Aperi</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
+%1</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttributesModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Nomen</translation>
+    </message>
+</context>
+<context>
+    <name>EntryHistoryModel</name>
+    <message>
+        <source>Last modified</source>
+        <translation>Ultima modificatio</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Titulus</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Nomen usuari</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+</context>
+<context>
+    <name>EntryModel</name>
+    <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation>Ref:</translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation>Classis</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Titulus</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Nomen usuari</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Tessera</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notae</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Exspirat</translation>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Accessed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Claude</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Generale</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Nomen usuari</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Tessera</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notae</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Fenestra</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Sequentia</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Quaere</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Debilitatum</translation>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryView</name>
+    <message>
+        <source>Customize View</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide Usernames</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide Passwords</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fit to window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fit to contents</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reset to defaults</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments (icon)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Group</name>
+    <message>
+        <source>Recycle Bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KMessageWidget</name>
+    <message>
+        <source>&amp;Close</source>
+        <translation>&amp;Claude</translation>
+    </message>
+    <message>
+        <source>Close message</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>Aut archivum est falsum vel datorum basis est corrupta.</translation>
+    </message>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation>Irritus algorithmus symmetrice cifrandi.</translation>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation>Irritus algorithmus comprimendi.</translation>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>Istud non est KeePass datorum basis.</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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeePass1OpenWidget</name>
+    <message>
+        <source>Import KeePass1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open the database.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeePass1Reader</name>
+    <message>
+        <source>Unable to read keyfile.</source>
+        <translation>Archivum claviare legi non potest.</translation>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>Istud non est KeePass datorum basis.</translation>
+    </message>
+    <message>
+        <source>Unsupported encryption algorithm.</source>
+        <translation>Irritus algorithmus cifrandi.</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass database version.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Root</source>
+        <translation>Radix</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>Aut archivum est falsum vel datorum basis est corrupta.</translation>
+    </message>
+    <message>
+        <source>Key transformation failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group field type number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group id field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group creation time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group modification time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group expiry time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group level field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group field type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing group id or level</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing entry field type number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry modification time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry field type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeeShare</name>
+    <message>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
+    <message>
+        <source>Key Component</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>Naviga</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Archiva claviaria</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Archiva omnia</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Crea Archivum Claviare...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Selige archivum claviare</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>&amp;Datorum basis</translation>
+    </message>
+    <message>
+        <source>&amp;Recent databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>&amp;Adjutorium</translation>
+    </message>
+    <message>
+        <source>E&amp;ntries</source>
+        <translation>N&amp;omina</translation>
+    </message>
+    <message>
+        <source>&amp;Groups</source>
+        <translation>&amp;Classes</translation>
+    </message>
+    <message>
+        <source>&amp;Tools</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation>&amp;Exi</translation>
+    </message>
+    <message>
+        <source>&amp;About</source>
+        <translation>&amp;De</translation>
+    </message>
+    <message>
+        <source>&amp;Open database...</source>
+        <translation>&amp;Aperi datorum basem</translation>
+    </message>
+    <message>
+        <source>&amp;Save database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Close database</source>
+        <translation>&amp;Claude datorum basem</translation>
+    </message>
+    <message>
+        <source>&amp;Delete entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Edit group</source>
+        <translation>&amp;Muta classem</translation>
+    </message>
+    <message>
+        <source>&amp;Delete group</source>
+        <translation>&amp;Dele classem</translation>
+    </message>
+    <message>
+        <source>Sa&amp;ve database as...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database settings</source>
+        <translation>Datorum basis optiones</translation>
+    </message>
+    <message>
+        <source>&amp;Clone entry</source>
+        <translation>&amp;Clona nomen</translation>
+    </message>
+    <message>
+        <source>Copy &amp;username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy username to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy password to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation>&amp;Optiones</translation>
+    </message>
+    <message>
+        <source>Password Generator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Lock databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Title</source>
+        <translation>&amp;Titulus</translation>
+    </message>
+    <message>
+        <source>Copy title to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;URL</source>
+        <translation>&amp;URL</translation>
+    </message>
+    <message>
+        <source>Copy URL to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Notes</source>
+        <translation>&amp;Notae</translation>
+    </message>
+    <message>
+        <source>Copy notes to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Export to CSV file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Set up TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>E&amp;mpty recycle bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Optiones</translation>
+    </message>
+    <message>
+        <source>Toggle window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quit KeePassXC</source>
+        <translation>Exi KeePassXC</translation>
+    </message>
+    <message>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Donate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Report a &amp;bug</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy att&amp;ribute...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Radix</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>OpenSSHKey</name>
+    <message>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Base64 decoding failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file way too small.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file magic header id invalid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Found zero keys</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read public key.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No private key payload to decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Trying to run KDF without cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF while reading private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key type: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cipher IV is too short for MD5 kdf</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown KDF: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown key type: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PasswordEditWidget</name>
+    <message>
+        <source>Enter password:</source>
+        <translation>Intra tesseram:</translation>
+    </message>
+    <message>
+        <source>Confirm password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Tessera</translation>
+    </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"/>
+    </message>
+    <message>
+        <source>Password cannot be empty.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passwords do not match.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate master password</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PasswordGeneratorWidget</name>
+    <message>
+        <source>%p%</source>
+        <translation>%p%</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Tessera</translation>
+    </message>
+    <message>
+        <source>Character Types</source>
+        <translation>Characterum Typi</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters</source>
+        <translation>Litterae Maiusculae</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters</source>
+        <translation>Litterae minusculae</translation>
+    </message>
+    <message>
+        <source>Numbers</source>
+        <translation>Numeri</translation>
+    </message>
+    <message>
+        <source>Special Characters</source>
+        <translation>Characteres speciales</translation>
+    </message>
+    <message>
+        <source>Extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude look-alike characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Pick characters from every group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Length:</source>
+        <translation>&amp;Longitudo:</translation>
+    </message>
+    <message>
+        <source>Passphrase</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wordlist:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Separator:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>Accipe</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Claude</translation>
+    </message>
+    <message>
+        <source>Entropy: %1 bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password Quality: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Poor</source>
+        <comment>Password quality</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Weak</source>
+        <comment>Password quality</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Good</source>
+        <comment>Password quality</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excellent</source>
+        <comment>Password quality</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Dele</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Remove</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Debilita</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Database not opened</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database hash not available</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Client public key not received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot decrypt message</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation>Semita datorum basis</translation>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>NULL device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>error reading from device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>malformed string</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>missing closing quote</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation>Classis</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Titulus</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Nomen usuari</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Tessera</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notae</translation>
+    </message>
+    <message>
+        <source>Last Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation>Integratio cum Navigatore</translation>
+    </message>
+    <message>
+        <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Press</source>
+        <translation>Pressa</translation>
+    </message>
+    <message>
+        <source>Passive</source>
+        <translation>Passivum</translation>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new random diceware passphrase.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word count for the diceware passphrase.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wordlist for the diceware generator.
+[Default: EFF English]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new random password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>Archivum clausurarium est irritum. Incipiens instantiam novam.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Archivum clausurarium creari non potuit. Modus singulae instantiae debilitatus est.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>Archivum claviare pro datorum basi</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Error</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QtIOCompressor</name>
+    <message>
+        <source>Internal zlib error when compressing: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error writing to underlying device: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error opening underlying device: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading data from underlying device: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Internal zlib error when decompressing: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QtIOCompressor::open</name>
+    <message>
+        <source>The gzip format not supported in this version of zlib.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Internal zlib error: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SSHAgent</name>
+    <message>
+        <source>Agent connection failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
+        <source>Search</source>
+        <translation>Quaere</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Limit search to selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SettingsWidgetKeeShare</name>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Signer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key:</source>
+        <translation>Clavis:</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Trust</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ask</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Remove</translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Archiva omnia</translation>
+    </message>
+    <message>
+        <source>Select path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ShareObserver</name>
+    <message>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Always</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TotpDialog</name>
+    <message>
+        <source>Timed Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>000000</source>
+        <translation>000000</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>There was an error creating the QR code.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Closing in %1 seconds.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TotpSetupDialog</name>
+    <message>
+        <source>Setup TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key:</source>
+        <translation>Clavis:</translation>
+    </message>
+    <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation>Solitae RFC 6238 symboli optiones</translation>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation>Steam symboli optiones</translation>
+    </message>
+    <message>
+        <source>Use custom settings</source>
+        <translation>Optiones propriae</translation>
+    </message>
+    <message>
+        <source>Custom Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Time step:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> sec</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>6 digits</source>
+        <translation>6 digiti</translation>
+    </message>
+    <message>
+        <source>7 digits</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>8 digits</source>
+        <translation>8 digiti</translation>
+    </message>
+</context>
+<context>
+    <name>UpdateCheckDialog</name>
+    <message>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Claude</translation>
+    </message>
+    <message>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WelcomeWidget</name>
+    <message>
+        <source>Start storing your passwords securely in a KeePassXC database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create new database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open existing database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from KeePass 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from CSV</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recent databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Welcome to KeePassXC %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>YubiKeyEditWidget</name>
+    <message>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>YubiKey Challenge-Response</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No YubiKey inserted.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+</TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_lt.ts b/share/translations/keepassx_lt.ts
index cc8545195..8bff357d1 100644
--- a/share/translations/keepassx_lt.ts
+++ b/share/translations/keepassx_lt.ts
@@ -38,12 +38,6 @@
         <translation>Kopijuoti į iškarpinę</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>Versija %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>Poversijis: %1</translation>
     </message>
@@ -76,35 +70,48 @@ Branduolys: %3 %4</translation>
         <translation>Ypatinga padėka nuo KeePassXC komandos yra skiriama debfx už pradinės KeePassX programos sukūrimą.</translation>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
-        <translation>Darinio tipas: %1
-</translation>
+        <source>Version %1</source>
+        <translation>Versija %1</translation>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP prieigos patvirtinimas</translation>
+        <source>Build Type: %1</source>
+        <translation>Darinio tipas: %1</translation>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>Prisiminti šį sprendimą</translation>
+        <source>Auto-Type</source>
+        <translation>Automatinis rinkimas</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Leisti</translation>
+        <source>Browser Integration</source>
+        <translation>Naršyklės integracija</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>Atmesti</translation>
+        <source>SSH Agent</source>
+        <translation>SSH agentas</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>%1 užklausė prieigos prie slaptažodžių šiam elementui(-ams).
-Pasirinkite, ar norite leisti prieigą.</translation>
+        <source>YubiKey</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Nėra</translation>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -113,6 +120,277 @@ Pasirinkite, ar norite leisti prieigą.</translation>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>Įjungti SSH agentą (reikalauja paleidimo iš naujo)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Programos nustatymai</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Bendra</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Saugumas</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Konfigūracijos failo %1 prieigos klaida</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Pagrindiniai nustatymai</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>Įjungimo</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Paleisti tik vieną KeePassXC egzempliorių</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Prisiminti paskutines duomenų bazes</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Prisiminti paskutinius rakto failus ir saugumo saugiklius</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Paleidžiant programą, įkelti ankstesnes duomenų bazes</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>Paleidus programą, suskleisti langą</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>Failų tvarkymas</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation>Saugiai įrašyti duomenų bazės failus (gali būti nesuderinama su Dropbox ir t.t.)</translation>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation>Išsaugoti duomenų bazę prieš išsaugant</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Automatiškai įrašyti po kiekvieno pakeitimo</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Išeinant, automatiškai įrašyti</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Nežymėti duomenų bazė kaip pakeistą, jei buvo keičiami ne duomenys, o kita (pvz., išskleidžiamos grupės)</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Išoriškai modifikavus duomenų bazę, automatiškai įkelti ją iš naujo</translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>Įrašų tvarkymas</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>Kuriant įrašus, naudoti grupės piktogramą</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Kopijuojant į iškarpinę, suskleisti langą</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Bendra</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Rodyti sistemos dėklo piktogramą</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>Tamsi sistemos dėklo piktograma</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Suskleidus langą, slėpti jį į sistemos dėklą</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Kalba</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Automatinis rinkimas</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>Naudoti įrašo antraštę, norint sutapatinti langus visuotiniam Automatiniam rinkimui</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>Naudoti įrašo URL, norint sutapatinti langus visuotiniam Automatiniam rinkimui</translation>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>Visada klausti prieš atliekant automatinį rinkimą</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Visuotinis automatinio rinkimo spartusis klavišas</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation> ms</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>Laiko limitai</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>Išvalyti iškarpinę po</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>sek.</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>Užrakinti duomenų bazes, kai kompiuteris neaktyvus</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation>min.</translation>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>Patogumas</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Užrakinti duomenų bazes, kai yra užrakinamas ekranas ar uždaromas nešiojamojo kompiuterio dangtis</translation>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>Suskleidus langą, užrakinti duomenų bazes</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>Nereikalauti pakartoti slaptažodį, kai šis yra matomas</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>Pagal numatymą, slėpti įrašo pastabas</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>Privatumas</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -216,6 +494,26 @@ Pasirinkite, ar norite leisti prieigą.</translation>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Gerai</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Atsisakyti</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -289,14 +587,6 @@ Pasirinkite, ar norite leisti prieigą.</translation>
         <translation>Rikiuoti atitinkančius prisijungimo duomenis pagal na&amp;udotojo vardą</translation>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>&amp;Atjungti visas naršykles</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>Užmiršti visus įsimintus &amp;leidimus</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>Išplėstiniai</translation>
     </message>
@@ -362,19 +652,36 @@ Pasirinkite, ar norite leisti prieigą.</translation>
         <translation>&lt;b&gt;Įspėjimas:&lt;/b&gt; Šie parametrai gali būti pavojingi!</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>Vykdomieji failai (*.exe);;Visi failai (*.*)</translation>
+        <source>Select custom proxy location</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Executable Files (*)</source>
-        <translation>Vykdomieji failai (*)</translation>
+        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Select custom proxy location</source>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
+        <source>&amp;Tor Browser</source>
+        <translation type="unfinished"/>
+    </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: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation>Vykdomieji failai</translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation>Visi failai</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"/>
     </message>
 </context>
@@ -414,150 +721,43 @@ Ar norite jį perrašyti?</translation>
         <translation>Ar norite atnaujinti informaciją ties %1 - %2?</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Duomenų bazė užrakinta!</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Aktyvi duomenų bazė yra užrakinta!
-Prašome atrakinti pasirinktą duomenų bazę arba pasirinkti kitą, kuri būtų atrakinta.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Nustatymai neprieinami!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation>Aktyvioje duomenų bazėje nėra nustatymų įrašo.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Raktų nerasta</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation>KeePassXC nustatymuose nerasti bendrinami šifravimo raktai.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Pašalinti raktai iš duomenų bazės</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation><numerusform>%n šifravimo raktas sėkmingai pašalintas iš KeePassXC nustatymų.</numerusform><numerusform>%n šifravimo raktai sėkmingai pašalinti iš KeePassXC nustatymų.</numerusform><numerusform>%n šifravimo raktų sėkmingai pašalinta iš KeePassXC nustatymų.</numerusform><numerusform>%n šifravimo raktų sėkmingai pašalinta iš KeePassXC nustatymų.</numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>Šalinami saugomi leidimai…</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>Nutraukti</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Pašalinti leidimai</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Nerasta jokių įrašų su leidimais!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Aktyvioje duomenų bazėje nėra įrašo su leidimais.</translation>
-    </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>Slaptažodis</translation>
-    </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>Įrašykite slaptažodį:</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>Pakartokite slaptažodį:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;Rakto failas</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>Naršyti</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Kurti</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>Iššū&amp;kio atsakymas</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Įkelti iš naujo</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>Rakto failai</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>Visi failai</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>Sukurti rakto failą...</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>Nepavyko sukurti rakto failo : </translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>Pasirinkite rakto failą</translation>
+        <source>Converting attributes to custom data…</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty password</source>
-        <translation>Tuščias slaptažodis</translation>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>Ar tikrai norite naudoti tuščią eilutę kaip slaptažodį?</translation>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>Pateikti skirtingi slaptažodžiai.</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>Nepavyko nustatyti %1 kaip rakto failą:
-%2</translation>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Legacy key file format</source>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
         <translation type="unfinished"/>
     </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>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>Pagrindinio rakto pakeitimas nepavyko: neįterpta jokio YubiKey.</translation>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -638,14 +838,6 @@ Please consider generating a new key file.</source>
         <translation>Nėra CSV faile</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>Tuščias lauko pavadinimas</translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>stulpelis </translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>Importuota iš CSV failo</translation>
     </message>
@@ -654,48 +846,84 @@ Please consider generating a new key file.</source>
         <translation>Pradiniai duomenys: </translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>CSV faile yra aptikta klaida(-os)!</translation>
+        <source>Error</source>
+        <translation>Klaida</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation> dar žinutės praleistos]</translation>
+        <source>Empty fieldname %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Klaida</translation>
+        <source>column %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>CSV importavimas: tekstų rengyklėje yra klaidų:
-</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>Klaida</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Nepavyko apskaičiuoti pagrindinio rakto</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
-        <translation><numerusform>%n baitas, </numerusform><numerusform>%n baitai, </numerusform><numerusform>%n baitų, </numerusform><numerusform>%n baitų, </numerusform></translation>
+        <source>%n column(s)</source>
+        <translation><numerusform>%n stulpelis</numerusform><numerusform>%n stulpeliai</numerusform><numerusform>%n stulpelių</numerusform><numerusform>%n stulpelių</numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation>%1, %2, %3</translation>
     </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
-        <translation><numerusform>%n eilutė, </numerusform><numerusform>%n eilutės, </numerusform><numerusform>%n eilučių, </numerusform><numerusform>%n eilučių, </numerusform></translation>
+        <source>%n byte(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
-        <translation><numerusform>%n stulpelis</numerusform><numerusform>%n stulpeliai</numerusform><numerusform>%n stulpelių</numerusform><numerusform>%n stulpelių</numerusform></translation>
+        <source>%n row(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Šaknis</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>Failo %1 nėra.</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Nepavyko atverti failą %1.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation>Klaida skaitant duomenų bazę: %1</translation>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation>Nepavyko įrašyti, duomenų bazė neturi failo pavadinimo.</translation>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation>Atrakinti duomenų bazę - KeePassXC</translation>
     </message>
 </context>
 <context>
@@ -725,14 +953,6 @@ Please consider generating a new key file.</source>
         <translation>Iššūkio atsakymas:</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Nepavyko atverti duomenų bazės.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Nepavyksta atverti rakto failo</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation type="unfinished"/>
     </message>
@@ -759,101 +979,169 @@ Please consider generating a new key file.</source>
         <source>Select key file</source>
         <translation>Pasirinkite rakto failą</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>Taisyti duomenų bazę</translation>
+        <source>TouchID for quick unlock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Klaida</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Nepavyksta atverti rakto failo</translation>
+        <source>Can't open key file:
+%1</source>
+        <translation>Nepavyksta atverti rakto failo:
+%1</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Nepavyko atverti duomenų bazės.</translation>
+        <source>Passwords</source>
+        <translation>Slaptažodžiai</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Duomenų bazė atsivėrė tvarkingai. Nėra ką atlikti.</translation>
+        <source>Advanced Settings</source>
+        <translation>Išplėstiniai nustatymai</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>Pavyko</translation>
+        <source>General</source>
+        <translation>Bendra</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Saugumas</translation>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>Duomenų bazė buvo sėkmingai pataisyta
-Dabar galite ją įrašyti.</translation>
+        <source>Master Key</source>
+        <translation>Pagrindinis raktas</translation>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>Duomenų bazės pataisyti nepavyko.</translation>
+        <source>Encryption Settings</source>
+        <translation>Šifravimo nustatymai</translation>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation>Naršyklės integracija</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>Bendra</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>Šifravimas</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>&amp;Atjungti visas naršykles</translation>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
+        <source>Forg&amp;et all site-specific settings on entries</source>
         <translation type="unfinished"/>
     </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>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Understood, keep number</source>
+        <source>Stored keys</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>Atsisakyti</translation>
+        <source>Remove</source>
+        <translation>Šalinti</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
+        <source>Delete the selected key?</source>
+        <translation>Ištrinti pasirinktą raktą?</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
         <translation type="unfinished"/>
     </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>
+        <source>Key</source>
+        <translation>Raktas</translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation>Reikšmė</translation>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KDF unchanged</source>
+        <source>Disconnect all browsers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Raktų nerasta</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Pašalinti raktai iš duomenų bazės</translation>
+    </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
-        <translation><numerusform> MiB</numerusform><numerusform> MiB</numerusform><numerusform> MiB</numerusform><numerusform> MiB</numerusform></translation>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Šalinami saugomi leidimai…</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Nutraukti</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Pašalinti leidimai</translation>
     </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
-        <translation><numerusform> gija</numerusform><numerusform> gijos</numerusform><numerusform> gijų</numerusform><numerusform> gijų</numerusform></translation>
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: Nerasta jokių įrašų su leidimais!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Aktyvioje duomenų bazėje nėra įrašo su leidimais.</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
     </message>
 </context>
 <context>
@@ -890,6 +1178,109 @@ If you keep this number, your database may be too easy to crack!</source>
         <source>Parallelism:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation>Iššifravimo laikas:</translation>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation>?? s</translation>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation>Keisti</translation>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation>100 ms</translation>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation>5 s</translation>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation>Duomenų bazės formatas:</translation>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation>Tai yra svarbu tik tuo atveju, jeigu jums reikia naudoti duomenų bazę su kitomis programomis.</translation>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation>KDBX 4.0 (rekomenduojama)</translation>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation>KDBX 3.1</translation>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Atsisakyti</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation><numerusform> MiB</numerusform><numerusform> MiB</numerusform><numerusform> MiB</numerusform><numerusform> MiB</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation><numerusform> gija</numerusform><numerusform> gijos</numerusform><numerusform> gijų</numerusform><numerusform> gija</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation><numerusform>%1 ms</numerusform><numerusform>%1 ms</numerusform><numerusform>%1 ms</numerusform><numerusform>%1 ms</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -939,91 +1330,110 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>Šaknis</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 duomenų bazė</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Visi failai</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Atverti duomenų bazę</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>Failas nerastas!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Nepavyko atverti duomenų bazės.</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>Failas atvertas tik skaitymo veiksenoje.</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>Atverti CSV failą</translation>
+        <source>Add additional protection...</source>
+        <translation>Pridėti papildomą apsaugą...</translation>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>CSV failas</translation>
+        <source>No encryption key added</source>
+        <translation>Nepridėtas joks šifravimo raktas</translation>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>Visi failai (*)</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Sulieti duomenų bazę</translation>
+        <source>No password set</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Atverkite KeePass 1 duomenų bazę</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 type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1 duomenų bazė</translation>
+        <source>Unknown error</source>
+        <translation>Nežinoma klaida</translation>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>Užverti?</translation>
+        <source>Failed to change master key</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; yra redagavimo veiksenoje.
-Vis tiek atmesti pakeitimus ir užverti?</translation>
+        <source>Database Name:</source>
+        <translation>Duomenų bazės pavadinimas:</translation>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>Įrašyti pakeitimus?</translation>
+        <source>Description:</source>
+        <translation>Aprašas:</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>&quot;%1&quot; buvo pakeista.
-Įrašyti pakeitimus?</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 duomenų bazė</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Duomenų bazės rašymas nepavyko.</translation>
+        <source>All files</source>
+        <translation>Visi failai</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Slaptažodžiai</translation>
+        <source>Open database</source>
+        <translation>Atverti duomenų bazę</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Įrašyti duomenų bazę kaip</translation>
+        <source>CSV file</source>
+        <translation>CSV failas</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>Sulieti duomenų bazę</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Atverkite KeePass 1 duomenų bazę</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 duomenų bazė</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1034,39 +1444,40 @@ Save changes?</source>
         <translation>CSV failo įrašymas nepavyko.</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>Nauja duomenų bazė</translation>
+        <source>Database creation error</source>
+        <translation>Duomenų bazės sukūrimo klaida</translation>
     </message>
     <message>
-        <source>locked</source>
-        <translation>užrakinta</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 type="unfinished"/>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>Užrakinti duomenų bazę</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>Nepavyksta užrakinti duomenų bazės, kadangi šiuo metu ją redaguojate.
-Spauskite atšaukti, kad užbaigtumėte savo pakeitimus arba juos atmestumėte.</translation>
+        <source>Select CSV file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>Ši duomenų bazė buvo modifikuota.
-Ar prieš užrakinant, norite įrašyti duomenų bazę?
-Kitu atveju jūsų pakeitimai bus prarasti.</translation>
+        <source>New Database</source>
+        <translation>Nauja duomenų bazė</translation>
     </message>
     <message>
-        <source>Disable safe saves?</source>
-        <translation type="unfinished"/>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Nauja duomenų bazė]</translation>
     </message>
     <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 type="unfinished"/>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Užrakinta]</translation>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Tik skaitymui]</translation>
     </message>
 </context>
 <context>
@@ -1076,37 +1487,13 @@ Disable safe saves and try again?</source>
         <translation>Ieškoma...</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>Pakeisti pagrindinį raktą</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>Ištrinti įrašą?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>Ar tikrai norite ištrinti įrašą &quot;%1&quot;?</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Ištrinti įrašus?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Ar tikrai norite ištrinti %1 įrašų?</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Perkelti įrašą į šiukšlinę?</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation>Ar tikrai norite perkelti įrašą &quot;%1&quot; į šiukšlinę?</translation>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Perkelti įrašus į šiukšlinę?</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -1124,18 +1511,10 @@ Disable safe saves and try again?</source>
         <translation>Prisiminti mano pasirinkimą</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Ištrinti grupę?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>Ar tikrai norite ištrinti grupę &quot;%1&quot;?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Nepavyko apskaičiuoti pagrindinio rakto</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>Nėra esamos duomenų bazės.</translation>
     </message>
@@ -1170,10 +1549,6 @@ Do you want to merge your changes?</source>
 Ar norite sulieti savo pakeitimus?</translation>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>Nepavyko atverti naujos duomenų bazės failo, bandant automatiškai iš naujo įkelti šią duomenų bazę.</translation>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>Išvalyti šiukšlinę?</translation>
     </message>
@@ -1181,88 +1556,103 @@ Ar norite sulieti savo pakeitimus?</translation>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>Ar tikrai norite negrįžtamai viską ištrinti iš savo šiukšlinės?</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>Generuoti NTVS prieigos raktą</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Užverti</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Failas atvertas tik skaitymo veiksenoje.</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Bendra</translation>
+        <source>Lock Database?</source>
+        <translation>Užrakinti duomenų bazę?</translation>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Slaptažodis</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot; buvo pakeista.
+Įrašyti pakeitimus?</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>Galiojimas</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Naudotojo vardas</translation>
+        <source>Save changes?</source>
+        <translation>Įrašyti pakeitimus?</translation>
     </message>
     <message>
-        <source>Autotype</source>
-        <translation>Automatinis rinkimas</translation>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>Paieška</translation>
+        <source>Disable safe saves?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>Požymiai</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Priedai</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Pastabos</translation>
+        <source>Passwords</source>
+        <translation>Slaptažodžiai</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>Langas</translation>
+        <source>Save database as</source>
+        <translation>Įrašyti duomenų bazę kaip</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>Seka</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 duomenų bazė</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Paieška</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Išvalyti</translation>
+        <source>Delete group</source>
+        <translation>Ištrinti grupę</translation>
     </message>
     <message>
-        <source>Never</source>
-        <translation>Niekada</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[APSAUGOTA]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>Išjungta</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Įjungta</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1336,22 +1726,10 @@ Ar norite sulieti savo pakeitimus?</translation>
         <translation>Naujas požymis</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Patvirtinti šalinimą</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>Ar tikrai norite pašalinti šį požymi?</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[APSAUGOTA]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation>Norėdami rodyti ar taisyti, paspauskite atskleisti</translation>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>Rytoj</translation>
     </message>
@@ -1364,10 +1742,6 @@ Ar norite sulieti savo pakeitimus?</translation>
         <translation><numerusform>%n mėnesis</numerusform><numerusform>%n mėnesiai</numerusform><numerusform>%n mėnesių</numerusform><numerusform>%n mėnesių</numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 metai</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation>Naudoti sugeneruotą slaptaždoį?</translation>
     </message>
@@ -1379,6 +1753,26 @@ Ar norite sulieti savo pakeitimus?</translation>
         <source>Entry updated successfully.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation>[APSAUGOTA] Norėdami rodyti ar redaguoti, paspauskite atskleisti</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1624,6 +2018,81 @@ Ar norite sulieti savo pakeitimus?</translation>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>Forma</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Slaptažodis:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1681,10 +2150,6 @@ Ar norite sulieti savo pakeitimus?</translation>
         <translation>Nepavyko gauti svetainės piktogramos.</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Patarimas: Jūs galite įjungti Google kaip surogatą, perėję į Įrankiai&gt;Nustatymai&gt;Saugumas</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>Paveikslai</translation>
     </message>
@@ -1693,14 +2158,6 @@ Ar norite sulieti savo pakeitimus?</translation>
         <translation>Visi failai</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Pasirinkite paveikslą</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read icon</source>
-        <translation>Nepavyksta perskaityti piktogramos</translation>
-    </message>
-    <message>
         <source>Custom icon already exists</source>
         <translation>Tinkinta piktograma jau yra</translation>
     </message>
@@ -1709,8 +2166,36 @@ Ar norite sulieti savo pakeitimus?</translation>
         <translation>Patvirtinti ištrynimą</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>Šią piktogramą naudoja %1 įrašai ir ji bus pakeista numatytąja piktograma. Ar tikrai norite ją ištrinti?</translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation>Neįkelta jokių piktogramų</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1760,9 +2245,8 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation> - Dublikatas</translation>
+        <source>%1 - Clone</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1807,10 +2291,6 @@ This may cause the affected plugins to malfunction.</source>
         <translation><numerusform>Ar tikrai norite pašalinti %n priedą?</numerusform><numerusform>Ar tikrai norite pašalinti %n priedus?</numerusform><numerusform>Ar tikrai norite pašalinti %n priedų?</numerusform><numerusform>Ar tikrai norite pašalinti %n priedų?</numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Patvirtinti šalinimą</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>Įrašyti priedus</translation>
     </message>
@@ -1847,10 +2327,13 @@ This may cause the affected plugins to malfunction.</source>
 %1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>Nepavyko atverti failus:
-%1</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1934,109 +2417,167 @@ This may cause the affected plugins to malfunction.</source>
         <source>Attachments</source>
         <translation>Priedai</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>Taip</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>EntryView</name>
+    <name>EntryPreviewWidget</name>
     <message>
-        <source>Customize View</source>
-        <translation type="unfinished"/>
+        <source>Generate TOTP Token</source>
+        <translation>Generuoti NTVS prieigos raktą</translation>
     </message>
     <message>
-        <source>Hide Usernames</source>
-        <translation>Slėpti naudotojo vardus</translation>
+        <source>Close</source>
+        <translation>Užverti</translation>
     </message>
     <message>
-        <source>Hide Passwords</source>
-        <translation>Slėpti slaptažodžius</translation>
+        <source>General</source>
+        <translation>Bendra</translation>
     </message>
     <message>
-        <source>Fit to window</source>
-        <translation>Priderinti prie lango</translation>
+        <source>Username</source>
+        <translation>Naudotojo vardas</translation>
     </message>
     <message>
-        <source>Fit to contents</source>
-        <translation>Priderinti prie turinio</translation>
+        <source>Password</source>
+        <translation>Slaptažodis</translation>
     </message>
     <message>
-        <source>Reset to defaults</source>
-        <translation>Atstatyti į numatytuosius</translation>
+        <source>Expiration</source>
+        <translation>Galiojimas</translation>
     </message>
     <message>
-        <source>Attachments (icon)</source>
-        <translation>Priedai (piktograma)</translation>
+        <source>URL</source>
+        <translation>URL</translation>
     </message>
-</context>
-<context>
-    <name>Group</name>
     <message>
-        <source>Recycle Bin</source>
-        <translation>Šiukšlinė</translation>
+        <source>Attributes</source>
+        <translation>Požymiai</translation>
     </message>
-</context>
-<context>
-    <name>HostInstaller</name>
     <message>
-        <source>KeePassXC: Cannot save file!</source>
-        <translation>KeePassXC: Nepavyksta įrašyti failo!</translation>
+        <source>Attachments</source>
+        <translation>Priedai</translation>
     </message>
     <message>
-        <source>Cannot save the native messaging script file.</source>
+        <source>Notes</source>
+        <translation>Pastabos</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Automatinis rinkimas</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Langas</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Seka</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Paieška</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Paieška</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Išvalyti</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Niekada</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[APSAUGOTA]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Įjungta</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Išjungta</translation>
+    </message>
+    <message>
+        <source>Share</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>Ilgis:</translation>
-    </message>
+    <name>EntryView</name>
     <message>
-        <source>Character Types</source>
-        <translation>Simbolių tipai</translation>
+        <source>Customize View</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Upper Case Letters</source>
-        <translation>Viršutinio registro raidės</translation>
+        <source>Hide Usernames</source>
+        <translation>Slėpti naudotojo vardus</translation>
     </message>
     <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
+        <source>Hide Passwords</source>
+        <translation>Slėpti slaptažodžius</translation>
     </message>
     <message>
-        <source>Lower Case Letters</source>
-        <translation>Apatinio registro raidės</translation>
+        <source>Fit to window</source>
+        <translation>Priderinti prie lango</translation>
     </message>
     <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
+        <source>Fit to contents</source>
+        <translation>Priderinti prie turinio</translation>
     </message>
     <message>
-        <source>Numbers</source>
-        <translation>Skaičiai</translation>
+        <source>Reset to defaults</source>
+        <translation>Atstatyti į numatytuosius</translation>
     </message>
     <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
+        <source>Attachments (icon)</source>
+        <translation>Priedai (piktograma)</translation>
     </message>
+</context>
+<context>
+    <name>Group</name>
     <message>
-        <source>Special Characters</source>
-        <translation>Specialūs simboliai</translation>
+        <source>Recycle Bin</source>
+        <translation>Šiukšlinė</translation>
     </message>
     <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation>[tuščia]</translation>
     </message>
+</context>
+<context>
+    <name>GroupModel</name>
     <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Pašalinti panašiai atrodančius simbolius</translation>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>HostInstaller</name>
     <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>Užtikrinti, kad slaptažodyje būtų simboliai iš kiekvienos grupės</translation>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation>KeePassXC: Nepavyksta įrašyti failo!</translation>
     </message>
     <message>
-        <source>Extended ASCII</source>
-        <translation>Papildomi ASCII</translation>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2064,6 +2605,26 @@ This may cause the affected plugins to malfunction.</source>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Neteisingas raktas arba duomenų bazės failas yra pažeistas.</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation>trūksta duomenų bazės antraščių</translation>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>Neteisingas antraštės id dydis</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>Neteisingas antraštės lauko ilgis</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>Neteisingas antraštės duomenų ilgis</translation>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2223,10 +2784,6 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation>Nepalaikomas šifras</translation>
     </message>
@@ -2280,6 +2837,18 @@ Tai yra vienakryptis perkėlimas. Jūs negalėsite atverti importuotos duomenų
         <source>Unsupported KeePass 2 database version.</source>
         <translation>Nepalaikoma KeePass 2 duomenų bazės versija.</translation>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2352,10 +2921,6 @@ Tai yra vienakryptis perkėlimas. Jūs negalėsite atverti importuotos duomenų
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation>Nepavyko iššifruoti įrašo eilutės</translation>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation type="unfinished"/>
     </message>
@@ -2404,6 +2969,12 @@ Tai yra vienakryptis perkėlimas. Jūs negalėsite atverti importuotos duomenų
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2567,28 +3138,126 @@ Tai yra vienakryptis perkėlimas. Jūs negalėsite atverti importuotos duomenų
         <source>Invalid entry field type</source>
         <translation>Neteisingas įrašo lauko tipas</translation>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>Esamas vieno egzemplioriaus užrakto failas yra neteisingas. Paleidžiamas naujas egzempliorius.</translation>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>Nepavyko sukurti užrakto. Vieno egzemplioriaus veiksena išjungta.</translation>
+        <source>Import from</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Jau yra paleistas kitas KeePassXC egzempliorius.</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Lemtingoji klaida, testuojant šifravimo funkcijas.</translation>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Klaida</translation>
+        <source>Key Component</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Atsisakyti</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation>Pridėti %1</translation>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation>Keisti %1</translation>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation>Šalinti %1</translation>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>Naršyti</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Generuoti</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation>Rakto failas</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"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Rakto failai</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Visi failai</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Sukurti rakto failą...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Pasirinkite rakto failą</translation>
     </message>
 </context>
 <context>
@@ -2602,10 +3271,6 @@ Tai yra vienakryptis perkėlimas. Jūs negalėsite atverti importuotos duomenų
         <translation>&amp;Paskiausiai naudotos duomenų bazės</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Importuoti</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation>Ž&amp;inynas</translation>
     </message>
@@ -2614,14 +3279,6 @@ Tai yra vienakryptis perkėlimas. Jūs negalėsite atverti importuotos duomenų
         <translation>Į&amp;rašai</translation>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>Kopijuoti &amp;požymį į iškarpinę</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Grupės</translation>
     </message>
@@ -2650,30 +3307,10 @@ Tai yra vienakryptis perkėlimas. Jūs negalėsite atverti importuotos duomenų
         <translation>&amp;Užverti duomenų bazę</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>&amp;Nauja duomenų bazė</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>Sulieti su KeePassX duomenų baze</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>&amp;Pridėti naują įrašą</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>&amp;Rodyti/Taisyti įrašą</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>&amp;Ištrinti įrašą</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>&amp;Pridėti naują grupę</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>&amp;Taisyti grupę</translation>
     </message>
@@ -2686,14 +3323,6 @@ Tai yra vienakryptis perkėlimas. Jūs negalėsite atverti importuotos duomenų
         <translation>Įraš&amp;yti duomenų bazę kaip...</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Pakeisti &amp;pagrindinį raktą...</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>&amp;Duomenų bazės nustatymai</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>Duomenų bazės nustatymai</translation>
     </message>
@@ -2702,10 +3331,6 @@ Tai yra vienakryptis perkėlimas. Jūs negalėsite atverti importuotos duomenų
         <translation>&amp;Dubliuoti įrašą</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>&amp;Rasti</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>Kopijuoti &amp;naudotojo vardą</translation>
     </message>
@@ -2714,10 +3339,6 @@ Tai yra vienakryptis perkėlimas. Jūs negalėsite atverti importuotos duomenų
         <translation>Kopijuoti naudotojo vardą į iškarpinę</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>Kopijuoti &amp;slaptažodį</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>Kopijuoti slaptažodį į iškarpinę</translation>
     </message>
@@ -2730,14 +3351,6 @@ Tai yra vienakryptis perkėlimas. Jūs negalėsite atverti importuotos duomenų
         <translation>Slaptažodžių generatorius</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation>&amp;Atlikti automatinį rinkimą</translation>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>Atverti &amp;URL</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>&amp;Užrakinti duomenų bazes</translation>
     </message>
@@ -2770,22 +3383,6 @@ Tai yra vienakryptis perkėlimas. Jūs negalėsite atverti importuotos duomenų
         <translation>&amp;Eksportuoti į CSV failą...</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Importuoti KeePass 1 duomenų bazę...</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>Importuoti CSV failą...</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Pa&amp;taisyti duomenų bazę...</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>Rodyti NTVS</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>Nustatyti NTVS...</translation>
     </message>
@@ -2806,14 +3403,6 @@ Tai yra vienakryptis perkėlimas. Jūs negalėsite atverti importuotos duomenų
         <translation>Konfigūracijos failo %1 prieigos klaida</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>tik skaitymui</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Nustatymai</translation>
     </message>
@@ -2826,33 +3415,274 @@ Tai yra vienakryptis perkėlimas. Jūs negalėsite atverti importuotos duomenų
         <translation>Išeiti iš KeePassXC</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 duomenų bazė</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Prašome priliesti mygtuką ant savo YubiKey!</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Visi failai</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Atverti duomenų bazę</translation>
+        <source>&amp;Donate</source>
+        <translation>&amp;Paaukoti</translation>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Įrašyti pataisytą duomenų bazę</translation>
+        <source>Report a &amp;bug</source>
+        <translation>Pranešti apie &amp;klaidą</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Duomenų bazės rašymas nepavyko.</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Prašome priliesti mygtuką ant savo YubiKey!</translation>
+        <source>&amp;Import</source>
+        <translation>&amp;Importuoti</translation>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
+        <source>Copy att&amp;ribute...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation>&amp;Nauja duomenų bazė...</translation>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation>Sukurti naują duomenų bazę</translation>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation>&amp;Sulieti iš duomenų bazės...</translation>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation>Sulieti iš kitos KDBX duomenų bazės</translation>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation>&amp;Naujas įrašas</translation>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation>Pridėti naują įrašą</translation>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation>&amp;Taisyti įrašą</translation>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation>Rodyti ar taisyti įrašą</translation>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation>&amp;Nauja grupė</translation>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation>Pridėti naują grupę</translation>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation>Keisti pagrindinį &amp;raktą...</translation>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation>&amp;Duomenų bazės nustatymai...</translation>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation>Kopijuoti sla&amp;ptažodį</translation>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation>Atverti &amp;URL</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation>KeePass 1 duomenų bazė...</translation>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation>Importuoti KeePass 1 duomenų bazę</translation>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation>CSV failas...</translation>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation>Importuoti CSV failą</translation>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation>Pridedama trūkstama piktograma %1</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation>Sukurti naują KeePassXC duomenų bazę...</translation>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Šaknis</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation>Ši&amp;fravimo nustatymai</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>Čia galite derinti duomenų bazės šifravimo nustatymus. Nesijaudinkite, vėliau galėsite juos keisti duomenų bazės nustatymuose.</translation>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Išplėstiniai nustatymai</translation>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation>Paprasti nustatymai</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <translation>Šifravimo nustatymai</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>Čia galite derinti duomenų bazės šifravimo nustatymus. Nesijaudinkite, vėliau galėsite juos keisti duomenų bazės nustatymuose.</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation>Duomenų bazės pagrindinis raktas</translation>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -2956,126 +3786,35 @@ This version is not meant for production use.</source>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation>Dialogas</translation>
-    </message>
-    <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>Tai reikalinga, norint prie savo duomenų bazių gauti prieigą iš ChromeIPass ar PassIFox</translation>
-    </message>
-    <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>Įjungti KeePassHTTP serverį</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Bendra</translation>
-    </message>
-    <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>R&amp;odyti pranešimą, kai reikalaujama prisijungimo duomenų</translation>
-    </message>
-    <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>Vietoj visos srities visų įrašų, grąžina tik geriausiai tam tikrą URL atitinkančius įrašus.</translation>
-    </message>
-    <message>
-        <source>&amp;Return only best matching entries</source>
-        <translation>&amp;Grąžinti tik labiausiai atitinkančius įrašus</translation>
-    </message>
-    <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Už&amp;klausti atrakinti duomenų bazę, jeigu ji yra užrakinta</translation>
-    </message>
-    <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation>Bus grąžinami įrašai tik su ta pačia schema (http://, https://, ftp://, ...).</translation>
-    </message>
-    <message>
-        <source>&amp;Match URL schemes</source>
-        <translation>&amp;Atitikti URL schemas</translation>
-    </message>
-    <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Rikiuoti atitinkančius įrašus pagal na&amp;udotojo vardą</translation>
-    </message>
-    <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Rikiuoti atitinkančius įrašus pagal &amp;antraštę</translation>
-    </message>
-    <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>Ša&amp;linti iš aktyvios duomenų bazės visus bendrinamus šifravimo raktus</translation>
-    </message>
-    <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>Šal&amp;inti iš įrašų aktyvioje duomenų bazėje visus saugomus leidimus</translation>
-    </message>
-    <message>
-        <source>Password Generator</source>
-        <translation>Slaptažodžių generatorius</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Išplėstiniai</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Visada leisti &amp;prieigą prie įrašų</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Visada leisti įrašų at&amp;naujinimą</translation>
-    </message>
-    <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>Su klientu turi būti sujungta tik pasirinkta duomenų bazė.</translation>
-    </message>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Ieš&amp;koti atitinkančių įrašų visose atvertose duomenų bazėse</translation>
-    </message>
-    <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>Automatinis eilutės laukų kūrimas ar atnaujinimas nėra palaikomas.</translation>
+        <source>Enter password:</source>
+        <translation>Įrašykite slaptažodį:</translation>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>&amp;Grąžinti išplėstines eilutes, kurios prasideda &quot;KPH: &quot;</translation>
+        <source>Confirm password:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP prievadas:</translation>
+        <source>Password</source>
+        <translation>Slaptažodis</translation>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Numatytasis prievadas: 19455</translation>
+        <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"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC klausysis šio prievado ties 127.0.0.1</translation>
+        <source>Password cannot be empty.</source>
+        <translation>Slaptažodis negali būti tuščias.</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;Įspėjimas:&lt;/b&gt; Šie parametrai gali būti pavojingi!</translation>
+        <source>Passwords do not match.</source>
+        <translation>Slaptažodžiai nesutampa.</translation>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <source>Generate master password</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Nepavyksta susieti su privilegijuotais prievadais</translation>
-    </message>
-    <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Nepavyksta susieti su privilegijuotais prievadais žemiau 1024!
-Naudojamas numatytasis prievadas 19455.</translation>
-    </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
@@ -3145,18 +3884,10 @@ Naudojamas numatytasis prievadas 19455.</translation>
         <translation>Žodžių sąrašas:</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Žodžių skaičius:</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>Žodžių skirtukas:</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>Generuoti</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Kopijuoti</translation>
     </message>
@@ -3169,10 +3900,6 @@ Naudojamas numatytasis prievadas 19455.</translation>
         <translation>Užverti</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>Taikyti</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>Entropija: %1 bitų</translation>
     </message>
@@ -3200,6 +3927,171 @@ Naudojamas numatytasis prievadas 19455.</translation>
         <comment>Password quality</comment>
         <translation>Puikus</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation>Perjungti į išplėstinę veikseną</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Išplėstiniai</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation>{[(</translation>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation>.,:;</translation>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation>Kabutės</translation>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation>&quot; &apos;</translation>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation>Matematika</translation>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation>&lt;*+!?=</translation>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation>Brūkšniai</translation>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation>\_|-/</translation>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation>Perjungti į paprastą veikseną</translation>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation>Neįtraukti:</translation>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation>Žodžių ska&amp;ičius:</translation>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Ištrinti</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Šalinti</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Išjungti</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3220,34 +4112,18 @@ Naudojamas numatytasis prievadas 19455.</translation>
         <translation>Nepavyksta iššifruoti žinutės</translation>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
-        <translation>Baigėsi laikas ar nepavyksta prisijungti prie KeePassXC</translation>
-    </message>
-    <message>
         <source>Action cancelled or denied</source>
         <translation>Veiksmo atsisakyta arba jis atmestas</translation>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>KeePassXC association failed, try again</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key change was not successful</source>
-        <translation>Rakto keitimas nepavyko</translation>
-    </message>
-    <message>
         <source>Encryption key is not recognized</source>
         <translation>Šifravimo raktas yra neatpažintas</translation>
     </message>
     <message>
-        <source>No saved databases found</source>
-        <translation>Nerasta įrašytų duomenų bazių</translation>
-    </message>
-    <message>
         <source>Incorrect action</source>
         <translation>Neteisingas veiksmas</translation>
     </message>
@@ -3373,10 +4249,6 @@ Naudojamas numatytasis prievadas 19455.</translation>
         <translation>Norėdami atrakinti %1, įterpkite slaptažodį: </translation>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation>Nepavyko įkelti rakto failo %1 : %2</translation>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3458,12 +4330,6 @@ Prieinamos komandos:
         <translation>klaida skaitant iš įrenginio</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>failas tuščias!
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation>netaisyklinga eilutė</translation>
     </message>
@@ -3472,30 +4338,6 @@ Prieinamos komandos:
         <translation>trūksta užveriamosios kabutės</translation>
     </message>
     <message>
-        <source>AES: 256-bit</source>
-        <translation>AES: 256 bitų</translation>
-    </message>
-    <message>
-        <source>Twofish: 256-bit</source>
-        <translation>Twofish: 256 bitų</translation>
-    </message>
-    <message>
-        <source>ChaCha20: 256-bit</source>
-        <translation>ChaCha20: 256 bitų</translation>
-    </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – rekomenduojama)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 4)</source>
-        <translation>AES-KDF (KDBX 4)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 3.1)</source>
-        <translation>AES-KDF (KDBX 3.1)</translation>
-    </message>
-    <message>
         <source>Group</source>
         <translation>Grupė</translation>
     </message>
@@ -3524,10 +4366,6 @@ Prieinamos komandos:
         <translation>Sukurta</translation>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Browser Integration</source>
         <translation>Naršyklės integracija</translation>
     </message>
@@ -3556,10 +4394,6 @@ Prieinamos komandos:
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>count</source>
-        <translation>kiekis</translation>
-    </message>
-    <message>
         <source>Wordlist for the diceware generator.
 [Default: EFF English]</source>
         <translation type="unfinished"/>
@@ -3569,29 +4403,440 @@ Prieinamos komandos:
         <translation>Generuoti naują atsitiktinį slaptažodį.</translation>
     </message>
     <message>
-        <source>Length of the generated password.</source>
-        <translation>Generuoto slaptažodžio ilgis.</translation>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation>Rašymas į duomenų bazę patyrė nesėkmę %1.</translation>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation>Iškarpinė išvalyta!</translation>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation>kiekis</translation>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation>Nepavyko įkelti rakto failo %1: %2</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>Failo %1 nėra.</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Nepavyko atverti failą %1.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation>Klaida skaitant duomenų bazę:
+%1</translation>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
+        <source>Use extended ASCII</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
+        <source>Exclude character set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
+        <source>chars</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
+        <source>Exclude similar looking characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
+        <source>Include characters from every selected group</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256 bitų</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256 bitų</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256 bitų</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – rekomenduojama)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation>Neteisingi nustatymai</translation>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation>Neteisingas raktas</translation>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>Šalinti įrašą iš duomenų bazės.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>Įrašo, kurį šalinti, kelias.</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>Esamas vieno egzemplioriaus užrakto failas yra neteisingas. Paleidžiamas naujas egzempliorius.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Nepavyko sukurti užrakto. Vieno egzemplioriaus veiksena išjungta.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - daugiaplatformė slaptažodžių tvarkytuvė</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>norimų atverti slaptažodžių duomenų bazių failų pavadinimai (*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>kelias į tinkintą konfigūracijos failą</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>duomenų bazės rakto failas</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>nuskaityti duomenų bazės slaptažodį iš stdin</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Jau yra paleistas kitas KeePassXC egzempliorius.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Lemtingoji klaida, testuojant šifravimo funkcijas.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Klaida</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation>Duomenų bazės slaptažodis: </translation>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -3628,12 +4873,98 @@ Prieinamos komandos:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
+    <message>
+        <source>Agent connection failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation>Agento protokolo klaida.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation>Raktas jau buvo pridėtas.</translation>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation>Modifikatoriai</translation>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <source>Search...</source>
-        <translation>Ieškoti...</translation>
+        <source>match term exactly</source>
+        <translation type="unfinished"/>
     </message>
     <message>
+        <source>use regex in term</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation>Pavyzdžiai</translation>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
         <source>Search</source>
         <translation>Paieška</translation>
     </message>
@@ -3642,315 +4973,316 @@ Prieinamos komandos:
         <translation>Išvalyti</translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Skirti raidžių dydį</translation>
-    </message>
-    <message>
         <source>Limit search to selected group</source>
         <translation>Riboti paiešką iki pasirinktos grupės</translation>
     </message>
-</context>
-<context>
-    <name>Service</name>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC: Naujo rakto susiejimo užklausa</translation>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation>Jūs gavote susiejimo užklausą aukščiau esančiam raktui.
-Jei norite leisti jam gauti prieigą prie savo KeePassXC
-duomenų bazės, suteikite jam unikalų pavadinimą, kad atpažintumėte
-ir priimtumėte jį.</translation>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: Perrašyti esamą raktą?</translation>
+        <source>Case sensitive</source>
+        <translation>Skiriant raidžių registrą</translation>
     </message>
+</context>
+<context>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Bendrinamas šifravimo raktas, pavadinimu &quot;%1&quot; jau yra.
-Ar norite jį perrašyti?</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: Atnaujinti įrašą</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Ar norite atnaujinti informaciją ties %1 - %2?</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Duomenų bazė užrakinta!</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Aktyvi duomenų bazė yra užrakinta!
-Prašome atrakinti pasirinktą duomenų bazę arba pasirinkti kitą, kuri būtų atrakinta.</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Pašalinti raktai iš duomenų bazės</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    <message>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Raktų nerasta</translation>
+        <source>Key:</source>
+        <translation>Raktas:</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>KeePassHttp nustatymuose nerasta jokių bendrinamų šifravimo raktų.</translation>
+        <source>Generate</source>
+        <translation>Generuoti</translation>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Nustatymai neprieinami!</translation>
+        <source>Import</source>
+        <translation>Importuoti</translation>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>Aktyvioje duomenų bazėje nėra KeePassHttp nustatymų įrašo.</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>Šalinami saugomi leidimai...</translation>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>Nutraukti</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Pašalinti leidimai</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    <message>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Nerasta jokių įrašų su leidimais!</translation>
+        <source>Remove</source>
+        <translation>Šalinti</translation>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Aktyvioje duomenų bazėje nėra įrašo su leidimais.</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
-        <translation>Programos nustatymai</translation>
+        <source>Status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Bendra</translation>
+        <source>Fingerprint</source>
+        <translation>Kontrolinis kodas</translation>
     </message>
     <message>
-        <source>Security</source>
-        <translation>Saugumas</translation>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>Konfigūracijos failo %1 prieigos klaida</translation>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>Pagrindiniai nustatymai</translation>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Paleisti tik vieną KeePassXC egzempliorių</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>Prisiminti paskutines duomenų bazes</translation>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Prisiminti paskutinius rakto failus ir saugumo saugiklius</translation>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Paleidžiant programą, įkelti ankstesnes duomenų bazes</translation>
+        <source>All files</source>
+        <translation>Visi failai</translation>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>Išeinant, automatiškai įrašyti</translation>
+        <source>Select path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>Automatiškai įrašyti po kiekvieno pakeitimo</translation>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Išoriškai modifikavus duomenų bazę, automatiškai įkelti ją iš naujo</translation>
+        <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"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>Kopijuojant į iškarpinę, suskleisti langą</translation>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Paleidus programą, suskleisti langą</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>Kuriant įrašus, naudoti grupės piktogramą</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Nežymėti duomenų bazė kaip pakeistą, jei buvo keičiami ne duomenys, o kita (pvz., išskleidžiamos grupės)</translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
-        <translation>Slėpti išsamų rodinį</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>Rodyti sistemos dėklo piktogramą</translation>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>Suskleidus langą, slėpti jį į sistemos dėklą</translation>
+        <source>Never</source>
+        <translation>Niekada</translation>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
-        <translation>Neužverti lango, bet vietoj to, suskleisti jį į sistemos dėklą</translation>
+        <source>Always</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
-        <translation>Tamsi sistemos dėklo piktograma</translation>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Kalba</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Automatinis rinkimas</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>Naudoti įrašo antraštę, norint sutapatinti langus visuotiniam Automatiniam rinkimui</translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>Naudoti įrašo URL, norint sutapatinti langus visuotiniam Automatiniam rinkimui</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation>Visada klausti prieš atliekant automatinį rinkimą</translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Visuotinis automatinio rinkimo spartusis klavišas</translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>Automatinio rinkimo delsa</translation>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation> ms</translation>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
-        <translation>Įjungimo</translation>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
-        <translation>Failų tvarkymas</translation>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation>Saugiai įrašyti duomenų bazės failus (gali būti nesuderinama su Dropbox ir t.t.)</translation>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
-        <translation>Išsaugoti duomenų bazę prieš išsaugant</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
-        <translation>Įrašų tvarkymas</translation>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Bendra</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
-        <translation>Laiko limitai</translation>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>Išvalyti iškarpinę po</translation>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>sek.</translation>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>Užrakinti duomenų bazes, kai kompiuteris neaktyvus</translation>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Patogumas</translation>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Užrakinti duomenų bazes, kai yra užrakinamas ekranas ar uždaromas nešiojamojo kompiuterio dangtis</translation>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>Suskleidus langą, užrakinti duomenų bazes</translation>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>Nereikalauti pakartoti slaptažodį, kai šis yra matomas</translation>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Pagal numatymą, rodyti slaptažodžius atviruoju tekstu</translation>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>TotpDialog</name>
     <message>
-        <source>Hide passwords in the preview panel</source>
-        <translation>Slėpti slaptažodžius peržiūros skydelyje</translation>
+        <source>Timed Password</source>
+        <translation>Numatytosios trukmės slaptažodis</translation>
     </message>
     <message>
-        <source>Hide entry notes by default</source>
-        <translation>Pagal numatymą, slėpti įrašo pastabas</translation>
+        <source>000000</source>
+        <translation>000000</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>Privatumas</translation>
+        <source>Copy</source>
+        <translation>Kopijuoti</translation>
+    </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>
     </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>Naudoti Google kaip surogatą svetainių piktogramų atsiuntimui</translation>
+        <source>Copy</source>
+        <translation>Kopijuoti</translation>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>There was an error creating the QR code.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Closing in %1 seconds.</source>
+        <translation>Užveriama po %1 sekundžių.</translation>
+    </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation>Nustatyti NTVS</translation>
@@ -3972,59 +5304,84 @@ Prašome atrakinti pasirinktą duomenų bazę arba pasirinkti kitą, kuri būtų
         <translation>Naudoti tinkintus nustatymus</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>Pastaba: Keiskite šiuos nustatymus tik tuo atveju, jeigu žinote ką darote.</translation>
+        <source>Custom Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Time step:</source>
         <translation>Laiko žingsnis:</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8 skaitmenys</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>sek.</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>Kodo dydis:</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6 skaitmenys</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>Kodo dydis:</translation>
+        <source>7 digits</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>sek.</translation>
+        <source>8 digits</source>
+        <translation>8 skaitmenys</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>Numatytosios trukmės slaptažodis</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Kopijuoti</translation>
+        <source>Close</source>
+        <translation>Užverti</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>Nustoja galioti po</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>sekundžių</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>Atrakinti duomenų bazę</translation>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4059,41 +5416,25 @@ Prašome atrakinti pasirinktą duomenų bazę arba pasirinkti kitą, kuri būtų
     </message>
 </context>
 <context>
-    <name>main</name>
-    <message>
-        <source>Remove an entry from the database.</source>
-        <translation>Šalinti įrašą iš duomenų bazės.</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>Duomenų bazės kelias.</translation>
-    </message>
-    <message>
-        <source>Path of the entry to remove.</source>
-        <translation>Įrašo, kurį šalinti, kelias.</translation>
-    </message>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - daugiaplatformė slaptažodžių tvarkytuvė</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>norimų atverti slaptažodžių duomenų bazių failų pavadinimai (*.kdbx)</translation>
+        <source>Refresh</source>
+        <translation>Įkelti iš naujo</translation>
     </message>
     <message>
-        <source>path to a custom config file</source>
-        <translation>kelias į tinkintą konfigūracijos failą</translation>
+        <source>YubiKey Challenge-Response</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>duomenų bazės rakto failas</translation>
+        <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"/>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>nuskaityti duomenų bazės slaptažodį iš stdin</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Parent window handle</source>
+        <source>No YubiKey inserted.</source>
         <translation type="unfinished"/>
     </message>
 </context>
diff --git a/share/translations/keepassx_lv.ts b/share/translations/keepassx_lv.ts
new file mode 100644
index 000000000..8e3cdadff
--- /dev/null
+++ b/share/translations/keepassx_lv.ts
@@ -0,0 +1,5423 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="lv" version="2.1">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <source>About KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Contributors</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Debug Info</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Revision: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Distribution: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Libraries:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Operating system: %1
+CPU architecture: %2
+Kernel: %3 %4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled extensions:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Special thanks from the KeePassXC team go to debfx for creating the original KeePassX.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Version %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Build Type: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>YubiKey</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
+    <message>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AutoType</name>
+    <message>
+        <source>Couldn&apos;t find an entry that matches the window title:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AutoTypeAssociationsModel</name>
+    <message>
+        <source>Window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Default sequence</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AutoTypeMatchModel</name>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AutoTypeSelectDialog</name>
+    <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select entry to Auto-Type:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
+    <message>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember this decision</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation type="unfinished"/>
+    </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: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not ask permission for HTTP &amp;Basic Auth</source>
+        <extracomment>An extra HTTP Basic Auth setting</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Converting attributes to custom data…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CloneDialog</name>
+    <message>
+        <source>Clone Options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Replace username and password with references</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy history</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CsvImportWidget</name>
+    <message>
+        <source>Import CSV fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>filename</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>size, rows, columns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encoding</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Codec</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text is qualified by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fields are separated by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comments start with</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>First record has field names</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of headers line to discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Consider &apos;\&apos; an escape character</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Preview</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Column layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not present in CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Imported from CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Original data: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty fieldname %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>column %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error(s) detected in CSV file!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CsvParserModel</name>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n byte(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n row(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenWidget</name>
+    <message>
+        <source>Enter master key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key File:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TouchID for quick unlock</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can't open key file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
+    <message>
+        <source>Passwords</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
+    <message>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Master Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetBrowser</name>
+    <message>
+        <source>KeePassXC-Browser settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Stored keys</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete the selected key?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES:  256 Bit   (default)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish:  256 Bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Derivation Function:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Additional Database Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable &amp;compression (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetKeeShare</name>
+    <message>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
+    <message>
+        <source>Add additional protection...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No encryption key added</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No password set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to change master key</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
+    <message>
+        <source>Database Name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
+    <message>
+        <source>KeePass 2 Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export database to CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database creation error</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseWidget</name>
+    <message>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Do you really want to move %n entry(s) to the recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Execute command?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember my choice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No current database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No source database, nothing to do.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search Results (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No Results</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File has changed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The database file has changed. Do you want to load the changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>File opened in read only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock Database?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable safe saves?</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passwords</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save database as</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 2 Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Delete group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidget</name>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Different passwords supplied.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Tomorrow</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Apply generated password?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you want to apply the generated password to this entry?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry updated successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetAdvanced</name>
+    <message>
+        <source>Additional attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Protect</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reveal</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Foreground Color:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Background Color:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetAutoType</name>
+    <message>
+        <source>Enable Auto-Type for this entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>-</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Window title:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a specific sequence for this association:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetHistory</name>
+    <message>
+        <source>Show</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete all</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetMain</name>
+    <message>
+        <source>URL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Repeat:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Presets</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditGroupWidget</name>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Inherit from parent group (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditGroupWidgetMain</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Use default Auto-Type sequence of parent group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Set default Auto-Type se&amp;quence</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditWidgetIcons</name>
+    <message>
+        <source>&amp;Use default icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add custom icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete custom icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Download favicon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Custom icon already exists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm Delete</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Custom icon successfully downloaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>EditWidgetProperties</name>
+    <message>
+        <source>Created:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modified:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Accessed:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Uuid:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Plugin Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete plugin data?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to delete the selected plugin data?
+This may cause the affected plugins to malfunction.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Entry</name>
+    <message>
+        <source>%1 - Clone</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
+%1</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttributesModel</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryHistoryModel</name>
+    <message>
+        <source>Last modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryModel</name>
+    <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Accessed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryView</name>
+    <message>
+        <source>Customize View</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide Usernames</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide Passwords</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fit to window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fit to contents</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reset to defaults</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments (icon)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Group</name>
+    <message>
+        <source>Recycle Bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KMessageWidget</name>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close message</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeePass1OpenWidget</name>
+    <message>
+        <source>Import KeePass1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open the database.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeePass1Reader</name>
+    <message>
+        <source>Unable to read keyfile.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported encryption algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass database version.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Root</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key transformation failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group field type number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group id field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group creation time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group modification time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group expiry time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group level field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group field type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing group id or level</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing entry field type number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry modification time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry field type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeeShare</name>
+    <message>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
+    <message>
+        <source>Key Component</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Recent databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>E&amp;ntries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Tools</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;About</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Open database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Save database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Close database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Delete entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Edit group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Delete group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sa&amp;ve database as...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Clone entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy username to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy password to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password Generator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Lock databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy title to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy URL to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy notes to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Export to CSV file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Set up TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>E&amp;mpty recycle bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Toggle window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quit KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Donate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Report a &amp;bug</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy att&amp;ribute...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>OpenSSHKey</name>
+    <message>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Base64 decoding failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file way too small.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file magic header id invalid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Found zero keys</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read public key.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No private key payload to decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Trying to run KDF without cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF while reading private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key type: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cipher IV is too short for MD5 kdf</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown KDF: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown key type: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PasswordEditWidget</name>
+    <message>
+        <source>Enter password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Password cannot be empty.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passwords do not match.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate master password</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PasswordGeneratorWidget</name>
+    <message>
+        <source>%p%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character Types</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Upper Case Letters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lower Case Letters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Numbers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Special Characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude look-alike characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Pick characters from every group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Length:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passphrase</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wordlist:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Separator:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy: %1 bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password Quality: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Poor</source>
+        <comment>Password quality</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Weak</source>
+        <comment>Password quality</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Good</source>
+        <comment>Password quality</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excellent</source>
+        <comment>Password quality</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Database not opened</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database hash not available</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Client public key not received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot decrypt message</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>NULL device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>error reading from device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>malformed string</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>missing closing quote</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Last Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Press</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new random diceware passphrase.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word count for the diceware passphrase.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wordlist for the diceware generator.
+[Default: EFF English]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new random password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QtIOCompressor</name>
+    <message>
+        <source>Internal zlib error when compressing: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error writing to underlying device: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error opening underlying device: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading data from underlying device: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Internal zlib error when decompressing: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QtIOCompressor::open</name>
+    <message>
+        <source>The gzip format not supported in this version of zlib.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Internal zlib error: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SSHAgent</name>
+    <message>
+        <source>Agent connection failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Limit search to selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SettingsWidgetKeeShare</name>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Signer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Trust</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ask</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ShareObserver</name>
+    <message>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Always</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TotpDialog</name>
+    <message>
+        <source>Timed Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>000000</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"/>
+    </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></translation>
+    </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>There was an error creating the QR code.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Closing in %1 seconds.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TotpSetupDialog</name>
+    <message>
+        <source>Setup TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use custom settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Custom Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Time step:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>6 digits</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>7 digits</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>8 digits</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>UpdateCheckDialog</name>
+    <message>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WelcomeWidget</name>
+    <message>
+        <source>Start storing your passwords securely in a KeePassXC database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create new database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open existing database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from KeePass 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from CSV</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recent databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Welcome to KeePassXC %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>YubiKeyEditWidget</name>
+    <message>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>YubiKey Challenge-Response</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No YubiKey inserted.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+</TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_nb.ts b/share/translations/keepassx_nb.ts
index b83e5b2ee..f5c0945dc 100644
--- a/share/translations/keepassx_nb.ts
+++ b/share/translations/keepassx_nb.ts
@@ -38,12 +38,6 @@
         <translation>Kopier til utklippstavle</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>Versjon %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>Revisjon: %1</translation>
     </message>
@@ -76,35 +70,48 @@ Kjerne: %3 %4</translation>
         <translation>En spesiell takk fra KeePassXC-laget går til debfx, utvikler av programmet KeePassX.</translation>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
-        <translation>Bygge-type: %1
-</translation>
+        <source>Version %1</source>
+        <translation>Versjon %1</translation>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP Bekreft Tilgang</translation>
+        <source>Build Type: %1</source>
+        <translation>Byggetype: %1</translation>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>Husk dette valget</translation>
+        <source>Auto-Type</source>
+        <translation>Autoskriv</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Tillat</translation>
+        <source>Browser Integration</source>
+        <translation>Nettlesertillegg</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>Avvis</translation>
+        <source>SSH Agent</source>
+        <translation>SSH-agent</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>%1 spør om passordtilgang for følgende elementer.
-Velg om du vil gi tilgang eller ikke.</translation>
+        <source>YubiKey</source>
+        <translation>YubiKey</translation>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation>Berørings-id</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Ingen</translation>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -113,6 +120,277 @@ Velg om du vil gi tilgang eller ikke.</translation>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>Slå på SSH-agenten (krever programomstart)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Applikasjonsinnstillinger</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Generelt</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Sikkerhet</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Feil ved tilgang for konfigurasjonsfilen %1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Grunnleggende</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>Oppstart</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Kjør kun én instans av KeePassXC om gangen</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Husk de sist brukte databasene</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Husk de sist brukte nøkkelfilene og kopibeskyttelsesnøklene</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Åpne sist brukte databaser ved oppstart</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>Minimer ved programstart</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>Filhåndtering</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation>Sikker lagring av database-filer (kan være uforenelig med Dropbox, etc.)</translation>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation>Sikkerhetskopier database-filen før lagring</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Lagre automatisk etter hver endring</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Lagre automatisk ved avslutning </translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Ikke marker database som endret ved non-dataendringer (f.eks. ekspandere grupper)</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Last databasen automatisk på nytt hvis den blir endret eksternt </translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>Oppføringshåndtering</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>Bruk gruppeikon ved ny oppføring</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Minimer ved kopiering til utklippstavla</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Generelt</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation>Skjul verktøylinje (ikon)</translation>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation>Minimer istedenfor app-avslutning</translation>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Vis et ikon i systemkurven</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>Mørkt ikon i systemkurven</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Skjul vindu til systemkurven når minimert</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Språk</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Autoskriv</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>Bruk tittel i oppføringa for å matche vindu ved global Autoskriv</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>Bruk URL i oppføringa for å matche vindu ved global Autoskriv</translation>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>Alltid spør før utførelse av Autoskriv</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Global Autoskriv-hurtigtast</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation>Autoskriv tidsforsinkelse</translation>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation>ms</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation>Autoskriv start-tidsforsinkelse</translation>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>Tidsavbrudd</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>Slett utklippstavlen etter</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>sek</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>Lås databaser etter inaktivitet i</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation> min</translation>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation>Glem berørings-id etter inaktivitet i</translation>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>Bekvemmelighet</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Lås databaser når økta låses eller lokket lukkes</translation>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation>Glem berørings-id når økten er låst eller lokket er lukket</translation>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>Lås databaser når vinduet minimeres</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation>Lås tidligere låst database etter utført Autoskriv</translation>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>Ikke krev gjentakelse av passord ved klartekst-visning</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation>Ikke skjul passord når du redigerer dem</translation>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>Skjul notater i oppføringa som standard</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>Personvern</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -216,6 +494,26 @@ Velg om du vil gi tilgang eller ikke.</translation>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Avbryt</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -289,14 +587,6 @@ Velg om du vil gi tilgang eller ikke.</translation>
         <translation>Sorter samsvarende berettigelsesbevis etter &amp;brukernavn</translation>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>Kople &amp;fra alle nettleserne</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>Glem alle lagrede &amp;tillatelser</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>Avansert</translation>
     </message>
@@ -362,14 +652,6 @@ Velg om du vil gi tilgang eller ikke.</translation>
         <translation>&lt;b&gt;Advarsel:&lt;/b&gt; Disse innstillingene kan medføre risiko.</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>Programfiler (*.exe);;Alle filer (*.*)</translation>
-    </message>
-    <message>
-        <source>Executable Files (*)</source>
-        <translation>Programfiler (*)</translation>
-    </message>
-    <message>
         <source>Select custom proxy location</source>
         <translation>Oppgi en selvvalgt mellomtjerneradresse</translation>
     </message>
@@ -377,6 +659,31 @@ Velg om du vil gi tilgang eller ikke.</translation>
         <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
         <translation>Nettlesertillegget er foreløpig ikke tilgjengelig for «Snap»-utgaver.</translation>
     </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation>KeePassXC-Browser er nødvendig for at nettleserintegrasjonen skal fungere. &lt;br /&gt;Last den ned for %1 og %2.</translation>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation type="unfinished"/>
+    </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: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not ask permission for HTTP &amp;Basic Auth</source>
+        <extracomment>An extra HTTP Basic Auth setting</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>BrowserService</name>
@@ -416,152 +723,43 @@ Vil du overskrive den?</translation>
         <translation>Vil du oppdatere informasjonen i %1 - %2?</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Database låst!</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Den aktive databasen er låst!
-Lås opp valgt database eller velg en annen som er åpen.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Innstillinger ikke tilgjengelig!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation>Den aktive databasen inneholder ikke noen konfigurasjons-innstilling.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Ingen nøkler funnet</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation>Ingen delte krypteringsnøkler funnet i oppsettet i KeePassXC.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Fjernet nøkler fra database</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation><numerusform>Fjernet %n krypteringsnøkkel(er) fra oppsettet i KeePassXC.</numerusform><numerusform>Fjernet %n krypteringsnøkkel(er) fra oppsettet i KeePassXC.</numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>Fjerner lagrede tillatelser...</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Fjernet tillatelser</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation><numerusform>Fjernet tillatelser fra %n oppføring(er).</numerusform><numerusform>Fjernet tillatelser fra %n oppføring(er).</numerusform></translation>
-    </message>
-    <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Ingen oppføring med tillatelser funnet!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Den aktive databasen inneholder ikke et oppsett med tillatelser.</translation>
-    </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>Passord</translation>
-    </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>Angi passord:</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>Gjenta passord:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>Nø&amp;kkelfil</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>Bla</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Opprett</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>&amp;Utfordrer-respons</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Last på ny</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>Nøkkelfiler</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>Alle filer</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>Opprett nøkkelfil ...</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>Kan ikke opprette nøkkelfil :</translation>
+        <source>Converting attributes to custom data…</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Select a key file</source>
-        <translation>Velg en nøkkelfil</translation>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty password</source>
-        <translation>Tomt passord</translation>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>Vil du virkelig bruke en tom streng som passord?</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Different passwords supplied.</source>
-        <translation>Forskjellige passord oppgitt.</translation>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>Klarte ikke å bruke %1 som nøkkelfil:
-%2</translation>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Legacy key file format</source>
-        <translation>Eldre nøkkelfilformat</translation>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation type="unfinished"/>
     </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>Nøkkelfilen du bruker er av et eldre filformat som kan miste støtten i framtidige programversjoner.
-
-Vurder å opprette en ny nøkkelfil.</translation>
-    </message>
-    <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>Endring av hovednøkkel feilet: YubiKey ikke satt inn</translation>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -642,14 +840,6 @@ Vurder å opprette en ny nøkkelfil.</translation>
         <translation>Ikke tilstede i CSV-fil</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>Tomt feltnavn</translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>kolonne</translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>Importert fra CSV-fil</translation>
     </message>
@@ -658,47 +848,84 @@ Vurder å opprette en ny nøkkelfil.</translation>
         <translation>Originale data:</translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>Feil oppdaget i CSV filen !</translation>
+        <source>Error</source>
+        <translation>Feil</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation>hoppet over flere meldinger]</translation>
+        <source>Empty fieldname %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Feil</translation>
+        <source>column %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>CSV import: skriver har feil:</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>Feil</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Kan ikke kalkulere hovednøkkel</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
-        <translation><numerusform>%n byte(s), </numerusform><numerusform>%n byte(s), </numerusform></translation>
+        <source>%n column(s)</source>
+        <translation><numerusform>%n kolonne(r)</numerusform><numerusform>%n kolonne(r)</numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
-        <translation><numerusform>%n rad(er), </numerusform><numerusform>%n rad(er), </numerusform></translation>
+        <source>%n byte(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
-        <translation><numerusform>%n kolonne(r)</numerusform><numerusform>%n kolonne(r)</numerusform></translation>
+        <source>%n row(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Rot</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -728,14 +955,6 @@ Vurder å opprette en ny nøkkelfil.</translation>
         <translation>Utfordrer-respons:</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Kunne ikke åpne databasen.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Kan ikke åpne nøkkelfil</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation>Eldre nøkkelfilformat</translation>
     </message>
@@ -764,105 +983,168 @@ Vurder å opprette en ny nøkkelfil.</translation>
         <source>Select key file</source>
         <translation>Velg nøkkelfil</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>Reparer database</translation>
+        <source>TouchID for quick unlock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Feil</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Kan ikke åpne nøkkelfil</translation>
+        <source>Can't open key file:
+%1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Kunne ikke åpne databasen.</translation>
+        <source>Passwords</source>
+        <translation>Passord</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
+    <message>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Generelt</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Databasen ble åpnet uten feil. Ikke mer å gjøre.</translation>
+        <source>Security</source>
+        <translation>Sikkerhet</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>Vellykket</translation>
+        <source>Master Key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>Databasen er reparert.
-Du kan nå lagre den.</translation>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>Kan ikke fikse databasen.</translation>
+        <source>Browser Integration</source>
+        <translation>Nettlesertillegg</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>Generell</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>Kryptering</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>Kople &amp;fra alle nettleserne</translation>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Antall runder er for høyt</translation>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation type="unfinished"/>
     </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>Du bruker et svært høyt antall nøkkeltransformasjons-runder med Argon2.
-
-Dersom du beholder dette antallet så vil det ta timer eller dager (og kanskje lengre) å åpne databasen!</translation>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Understood, keep number</source>
-        <translation>Forstått; behold antallet</translation>
+        <source>Stored keys</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>Avbryt</translation>
+        <source>Remove</source>
+        <translation>Fjern</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Antall runder er for lavt</translation>
+        <source>Delete the selected key?</source>
+        <translation type="unfinished"/>
     </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>Du bruker et svært lavt antall nøkkeltransformasjons-runder med AES-KDF.
-
-Dersom du beholder dette antallet så kan databasen være for lett å knekke!</translation>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KDF unchanged</source>
-        <translation>KDF uendret</translation>
+        <source>Key</source>
+        <translation>Nøkkel</translation>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
-        <translation>Kunne ikke omskape nøkkel med nye KDF-parametere; KDF uendret.</translation>
+        <source>Value</source>
+        <translation>Verdi</translation>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Ingen nøkler funnet</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Fjernet nøkler fra database</translation>
     </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
-        <translation><numerusform> MiB</numerusform><numerusform> MiB</numerusform></translation>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Fjerner lagrede tillatelser...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Avbryt</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Fjernet tillatelser</translation>
     </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
-        <translation><numerusform>tråd(er)</numerusform><numerusform>tråd(er)</numerusform></translation>
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: Ingen oppføring med tillatelser funnet!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Den aktive databasen inneholder ikke et oppsett med tillatelser.</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
     </message>
 </context>
 <context>
@@ -899,6 +1181,113 @@ Dersom du beholder dette antallet så kan databasen være for lett å knekke!</t
         <source>Parallelism:</source>
         <translation>Parallellitet:</translation>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Antall runder er for høyt</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>Du bruker et svært høyt antall nøkkeltransformasjons-runder med Argon2.
+
+Dersom du beholder dette antallet så vil det ta timer eller dager (og kanskje lengre) å åpne databasen!</translation>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation>Forstått; behold antallet</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Avbryt</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Antall runder er for lavt</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>Du bruker et svært lavt antall nøkkeltransformasjons-runder med AES-KDF.
+
+Dersom du beholder dette antallet så kan databasen være for lett å knekke!</translation>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation>KDF uendret</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation>Kunne ikke omskape nøkkel med nye KDF-parametere; KDF uendret.</translation>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -948,91 +1337,110 @@ Dersom du beholder dette antallet så kan databasen være for lett å knekke!</t
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>Rot</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 Database</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Alle filer</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Åpne database</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>Finner ikke filen!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Kunne ikke åpne databasen.</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>Fil åpnet i skrivebeskyttet modus.</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>Åpne CSV fil</translation>
+        <source>Add additional protection...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>CSV fil</translation>
+        <source>No encryption key added</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>Alle filer (*)</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Slå sammen database</translation>
+        <source>No password set</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Åpne KeePass 1 database</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 type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1 database</translation>
+        <source>Unknown error</source>
+        <translation>Ukjent feil</translation>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>Lukk?</translation>
+        <source>Failed to change master key</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; blir redigert.
-Vil du likevel avvise endringene?</translation>
+        <source>Database Name:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>Lagre endringer?</translation>
+        <source>Description:</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>&quot;%1&quot; er endet.
-Lagre endringer?</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 Database</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Skriving av databasen feilet.</translation>
+        <source>All files</source>
+        <translation>Alle filer</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Passord</translation>
+        <source>Open database</source>
+        <translation>Åpne database</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Lagre database som</translation>
+        <source>CSV file</source>
+        <translation>CSV fil</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>Slå sammen database</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Åpne KeePass 1 database</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 database</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1043,40 +1451,40 @@ Lagre endringer?</translation>
         <translation>Skriving av CSV fil feilet.</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>Ny database</translation>
+        <source>Database creation error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>locked</source>
-        <translation>låst</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 type="unfinished"/>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>Lås database</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>Kan ikke låse databasen fordi du redigerer den.
-Klikk Avbryt for å fullføre eller forkaste endringene.</translation>
+        <source>Select CSV file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>Denne databasen er blitt endret.
-Vil du lagre databasen før låsing?
-Ellers blir endringene dine tapt.</translation>
+        <source>New Database</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disable safe saves?</source>
-        <translation>Deaktivere sikker lagring?</translation>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
     </message>
     <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 har mislykkes i å lagre databasen flere ganger. Dette er trolig forårsaket av at synkroniserings-tjenester har låst lagrings-filen.
-Deaktivere sikker lagring og prøve igjen?</translation>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1086,37 +1494,13 @@ Deaktivere sikker lagring og prøve igjen?</translation>
         <translation>Søker...</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>Endre hovednøkkel</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>Slette oppføring?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>Vil du virkelig slette oppføringen &quot;%1&quot; for godt?</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Slett oppføringer?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Ønsker du virkelig å slette %1 oppføringer for godt?</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Flytte oppføring til søppelkurven?</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation>Ønsker du virkelig å flytte oppføring &quot;%1&quot; til søppelkurven?</translation>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Flytt oppføringer til søppelkurven?</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation><numerusform>Ønsker du virkelig å flytte %n oppføring(er) til søppelkurven?</numerusform><numerusform>Ønsker du virkelig å flytte %n oppføring(er) til søppelkurven?</numerusform></translation>
@@ -1134,18 +1518,10 @@ Deaktivere sikker lagring og prøve igjen?</translation>
         <translation>Husk mitt valg</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Slett gruppe?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>Ønsker du virkelig å slette gruppen &quot;%1&quot; for godt?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Kan ikke kalkulere hovednøkkel</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>Ingen nåværende database.</translation>
     </message>
@@ -1180,10 +1556,6 @@ Do you want to merge your changes?</source>
 Vil du slå sammen fila med endringene dine?</translation>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>Kunne ikke åpne den nye databasen så lenge denne databasen blir auto-lastet.</translation>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>Tom papirkurv?</translation>
     </message>
@@ -1191,88 +1563,104 @@ Vil du slå sammen fila med endringene dine?</translation>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>Er du sikker på at du ønsker å slette alt i papirkurven permanent?</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>Opprett TOTP Token</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Lukk</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Fil åpnet i skrivebeskyttet modus.</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Generell</translation>
+        <source>Lock Database?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Passord</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot; er endet.
+Lagre endringer?</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>Utløp</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Brukernavn</translation>
+        <source>Save changes?</source>
+        <translation>Lagre endringer?</translation>
     </message>
     <message>
-        <source>Autotype</source>
-        <translation>Autoskriv</translation>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>Søking</translation>
+        <source>Disable safe saves?</source>
+        <translation>Deaktivere sikker lagring?</translation>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>Attributter</translation>
+        <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 har mislykkes i å lagre databasen flere ganger. Dette er trolig forårsaket av at synkroniserings-tjenester har låst lagrings-filen.
+Deaktivere sikker lagring og prøve igjen?</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Vedlegg</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Notater</translation>
+        <source>Passwords</source>
+        <translation>Passord</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>Vindu</translation>
+        <source>Save database as</source>
+        <translation>Lagre database som</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>Sekvens</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 Database</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Søk</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Tøm</translation>
+        <source>Delete group</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Never</source>
-        <translation>Aldri</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[BESKYTTET]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>Deaktivert</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Aktivert</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1346,22 +1734,10 @@ Vil du slå sammen fila med endringene dine?</translation>
         <translation>Ny attributt</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Bekreft fjerning</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>Er du sikker på at du ønsker å fjerne denne attributten?</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[BESKYTTET]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation>Klikk for å vise eller endre</translation>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>I morgen</translation>
     </message>
@@ -1374,10 +1750,6 @@ Vil du slå sammen fila med endringene dine?</translation>
         <translation><numerusform>%n måned(er)</numerusform><numerusform>%n måned(er)</numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 år</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation>Vil du bruke det lagde passordet?</translation>
     </message>
@@ -1389,6 +1761,26 @@ Vil du slå sammen fila med endringene dine?</translation>
         <source>Entry updated successfully.</source>
         <translation>Oppføring oppdatert.</translation>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1634,6 +2026,81 @@ Vil du slå sammen fila med endringene dine?</translation>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>Skjema</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Passord:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1691,10 +2158,6 @@ Vil du slå sammen fila med endringene dine?</translation>
         <translation>Kan ikke hente favorittikon.</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Tips: Du kan aktivere Google som reserve under Verktøy &gt; Oppsett &gt; Sikkerhet</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>Bilder</translation>
     </message>
@@ -1703,14 +2166,6 @@ Vil du slå sammen fila med endringene dine?</translation>
         <translation>Alle filer</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Velg bilde</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read icon</source>
-        <translation>Kan ikke lese ikon</translation>
-    </message>
-    <message>
         <source>Custom icon already exists</source>
         <translation>Tilpasset ikon finnes allerede</translation>
     </message>
@@ -1719,8 +2174,36 @@ Vil du slå sammen fila med endringene dine?</translation>
         <translation>Bekreft sletting</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>Dette ikonet er brukt av %1 oppføringer, og vil bli erstattet av standardikonet. Er du sikker på at du vil slette det?</translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1771,9 +2254,8 @@ Dette kan føre til feil for de berørte programtilleggene.</translation>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation>- Klone</translation>
+        <source>%1 - Clone</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1818,10 +2300,6 @@ Dette kan føre til feil for de berørte programtilleggene.</translation>
         <translation><numerusform>Er du sikker på at du vil fjerne %n vedlegg?</numerusform><numerusform>Er du sikker på at du vil fjerne %n vedlegg?</numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Bekreft fjerning</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>Lagre vedlegg</translation>
     </message>
@@ -1858,10 +2336,13 @@ Dette kan føre til feil for de berørte programtilleggene.</translation>
 %1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>Kan ikke åpne filer:
-%1</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1945,6 +2426,106 @@ Dette kan føre til feil for de berørte programtilleggene.</translation>
         <source>Attachments</source>
         <translation>Vedlegg</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>Opprett TOTP Token</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Lukk</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Generelt</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Brukernavn</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Passord</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Utløp</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>Adresse</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>Attributter</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Vedlegg</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notater</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Autoskriv</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Vindu</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Rekkefølge</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Søking</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Søk</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Tøm</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Aldri</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[BESKYTTET]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Aktivert</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Deaktivert</translation>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EntryView</name>
@@ -1983,6 +2564,19 @@ Dette kan føre til feil for de berørte programtilleggene.</translation>
         <source>Recycle Bin</source>
         <translation>Papirkurv</translation>
     </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>HostInstaller</name>
@@ -1996,61 +2590,6 @@ Dette kan føre til feil for de berørte programtilleggene.</translation>
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>Lengde:</translation>
-    </message>
-    <message>
-        <source>Character Types</source>
-        <translation>Tegntyper</translation>
-    </message>
-    <message>
-        <source>Upper Case Letters</source>
-        <translation>Store bokstaver</translation>
-    </message>
-    <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
-    </message>
-    <message>
-        <source>Lower Case Letters</source>
-        <translation>Små bokstaver</translation>
-    </message>
-    <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
-    </message>
-    <message>
-        <source>Numbers</source>
-        <translation>Tall</translation>
-    </message>
-    <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
-    </message>
-    <message>
-        <source>Special Characters</source>
-        <translation>Spesialtegn</translation>
-    </message>
-    <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
-    </message>
-    <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Ekskluder tegn som er nesten makne</translation>
-    </message>
-    <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>Pass på at passordet inneholder tegn fra hver gruppe</translation>
-    </message>
-    <message>
-        <source>Extended ASCII</source>
-        <translation>Utvida ASCII</translation>
-    </message>
-</context>
-<context>
     <name>KMessageWidget</name>
     <message>
         <source>&amp;Close</source>
@@ -2075,6 +2614,26 @@ Dette kan føre til feil for de berørte programtilleggene.</translation>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Feil nøkkel eller databasefil er skadet.</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation>manglende database-headere</translation>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>Ugyldig: Header id size</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>Ugyldig: Header field length</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>Ugyldig: Header data length</translation>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2234,10 +2793,6 @@ Dette kan føre til feil for de berørte programtilleggene.</translation>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation>Ugyldig: Cipher uuid length</translation>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation>Ikke støttet kryptering</translation>
     </message>
@@ -2291,6 +2846,18 @@ Dette er en en-veis-migrasjon. Du kan ikke åpne den importerte databasen med de
         <source>Unsupported KeePass 2 database version.</source>
         <translation>Ikke støttet KeePass2 databaseversjon.</translation>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2363,10 +2930,6 @@ Dette er en en-veis-migrasjon. Du kan ikke åpne den importerte databasen med de
         <translation>Historikkelement med forskjellig uuid</translation>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation>Kan ikke dekryptere streng i oppføring</translation>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation>Duplikat: Custom attribute</translation>
     </message>
@@ -2415,6 +2978,12 @@ Dette er en en-veis-migrasjon. Du kan ikke åpne den importerte databasen med de
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation>Kan ikke dekryptere binær</translation>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2578,28 +3147,126 @@ Dette er en en-veis-migrasjon. Du kan ikke åpne den importerte databasen med de
         <source>Invalid entry field type</source>
         <translation>Ugyldig: Entry field type</translation>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>Eksisterende enbrukermodus lock-fil er ugyldig. Starter ny instans.</translation>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>Lock-filen kunne ikke opprettes. Enbrukermodus deaktivert.</translation>
+        <source>Import from</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>En annen instans av KeePassXC kjører allerede.</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Alvorlig feil ved testing av de kryptografiske funksjonene.</translation>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
+    <message>
+        <source>Key Component</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Feil</translation>
+        <source>Key Component Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Avbryt</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>Bla gjennom</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Lag passord</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation>Eldre nøkkelfilformat</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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Nøkkelfiler</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Alle filer</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Opprett nøkkelfil ...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Velg en nøkkelfil</translation>
     </message>
 </context>
 <context>
@@ -2613,10 +3280,6 @@ Dette er en en-veis-migrasjon. Du kan ikke åpne den importerte databasen med de
         <translation>N&amp;ylige databaser</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Importer</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation>&amp;Hjelp</translation>
     </message>
@@ -2625,14 +3288,6 @@ Dette er en en-veis-migrasjon. Du kan ikke åpne den importerte databasen med de
         <translation>&amp;Oppføringer</translation>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>Kopier attributt til &amp;utklippstavla</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation>&amp;Tidsbasert engangspassord</translation>
-    </message>
-    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Grupper</translation>
     </message>
@@ -2661,30 +3316,10 @@ Dette er en en-veis-migrasjon. Du kan ikke åpne den importerte databasen med de
         <translation>&amp;Lukk database</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>&amp;Ny database</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>Slå sammen med en KeePassX-database</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>&amp;Lag ny oppføring</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>&amp;Vis/Rediger oppføring</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>&amp;Slett oppføring</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>&amp;Lag ny gruppe</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>&amp;Rediger gruppe</translation>
     </message>
@@ -2697,14 +3332,6 @@ Dette er en en-veis-migrasjon. Du kan ikke åpne den importerte databasen med de
         <translation>Lag&amp;re database som...</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Endre &amp;hovednøkkel...</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>&amp;Databaseoppsett</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>Databaseoppsett</translation>
     </message>
@@ -2713,10 +3340,6 @@ Dette er en en-veis-migrasjon. Du kan ikke åpne den importerte databasen med de
         <translation>&amp;Klon oppføring</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>&amp;Finn</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>Kopier &amp;brukernavn</translation>
     </message>
@@ -2725,10 +3348,6 @@ Dette er en en-veis-migrasjon. Du kan ikke åpne den importerte databasen med de
         <translation>Kopier brukernavn til utklippstavlen</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>Kopier &amp;passord</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>Kopier passord til utklippstavlen</translation>
     </message>
@@ -2741,14 +3360,6 @@ Dette er en en-veis-migrasjon. Du kan ikke åpne den importerte databasen med de
         <translation>Passordgenerator</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation>Kjør &amp;Autoskriv</translation>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>Åpne &amp;URL</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>&amp;Lås databaser</translation>
     </message>
@@ -2781,22 +3392,6 @@ Dette er en en-veis-migrasjon. Du kan ikke åpne den importerte databasen med de
         <translation>&amp;Eksporter som CSV-fil...</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Importer KeePass 1-database...</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>Importer CSV-fil...</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Re&amp;parer database...</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>Vis TOTP</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>Sett opp TOTP...</translation>
     </message>
@@ -2817,14 +3412,6 @@ Dette er en en-veis-migrasjon. Du kan ikke åpne den importerte databasen med de
         <translation>Feil ved tilgang for konfigurasjonsfilen %1</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Det ser ut som du bruker KeePassHTTP som nettleserintegrasjon. Denne funksjonen har blitt utdatert og vil bli fjerna i framtida.&lt;br&gt;Vennligst bytt til KeePassXC-nettleseren isteden! For hjelp med overgang, besøk vår &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;overgangs-håndbok&lt;/a&gt; (advarsel %1 of 3).&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>skrivebeskyttet</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Oppsett</translation>
     </message>
@@ -2837,36 +3424,278 @@ Dette er en en-veis-migrasjon. Du kan ikke åpne den importerte databasen med de
         <translation>Avslutt KeePassXC</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 Database</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Vennligst trykk på knappen på din YubiKey!</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Alle filer</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation>ADVARSEL: Du bruker en ustabil bygge-versjon av KeePassXC!
+Det er stor risiko for inkonsistens, ha en sikkerhetskopi av databasene dine.
+Denne versjonen er ikke ment for produksjonsmiljø.</translation>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Åpne database</translation>
+        <source>&amp;Donate</source>
+        <translation>&amp;Doner</translation>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Lagre reparert database</translation>
+        <source>Report a &amp;bug</source>
+        <translation>Meld inn en &amp;feil</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Skriving av databasen feilet.</translation>
+        <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>ADVARSEL: Qt-versjon du bruker kan føre til at KeePassXC kræsjer med et skjermtastatur!
+Vi anbefaler at du bruker det AppImage som er tilgjengelig på nedlastingssiden.</translation>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Vennligst trykk på knappen på din YubiKey!</translation>
+        <source>&amp;Import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
-        <translation>ADVARSEL: Du bruker en ustabil bygge-versjon av KeePassXC!
-Det er stor risiko for inkonsistens, ha en sikkerhetskopi av databasene dine.
-Denne versjonen er ikke ment for produksjonsmiljø.</translation>
+        <source>Copy att&amp;ribute...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Rot</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2969,125 +3798,34 @@ Denne versjonen er ikke ment for produksjonsmiljø.</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation>Vindu</translation>
-    </message>
-    <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>Dette kreves for å få tilgang til databasene dine fra ChromeIPass eller PassIFox</translation>
-    </message>
-    <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>Aktiver KeePassHTTP-server</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Generell</translation>
-    </message>
-    <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>Vi&amp;s beskjed når det blir bedt om identifikasjon</translation>
-    </message>
-    <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>Returnerer bare beste matcher for en spesifikk URL i stedet for alle oppføringer i hele domenet.</translation>
-    </message>
-    <message>
-        <source>&amp;Return only best matching entries</source>
-        <translation>&amp;Returner bare de beste matchende oppføringene</translation>
-    </message>
-    <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Spør om å låse opp dersom databasen er låst</translation>
-    </message>
-    <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation>Bare oppføringer med samme protokoll (http://, https://,, ftp://, ...) er returnert.</translation>
-    </message>
-    <message>
-        <source>&amp;Match URL schemes</source>
-        <translation>&amp;Match URL-skjema</translation>
-    </message>
-    <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Sorter matchende oppføringer etter &amp;brukernavn</translation>
-    </message>
-    <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Sorter &amp;matchende oppføringer etter tittel</translation>
-    </message>
-    <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>Fj&amp;ern alle delte krypteringsnøkler fra aktiv database</translation>
-    </message>
-    <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>Fjer&amp;n alle lagrede tillatelser fra oppføringer i aktiv database</translation>
-    </message>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>Password Generator</source>
-        <translation>Passordgenerator</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Avansert</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Tillat alltid tilg&amp;ang til oppføringer</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Tillat alltid å &amp;oppdatere oppføringer</translation>
-    </message>
-    <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>Kun den valgte databasen behøver å kobles til en klient.</translation>
-    </message>
-    <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Sø&amp;k i alle åpne databaser etter matchende oppføringer</translation>
-    </message>
-    <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>Automatisk registrering eller endring av tekstfelt er ikke støttet.</translation>
-    </message>
-    <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>&amp;Returner avanserte tekstfelt som begynner med &quot;KPH: &quot;</translation>
-    </message>
-    <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP-port:</translation>
+        <source>Enter password:</source>
+        <translation>Angi passord:</translation>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Standard port: 19455</translation>
+        <source>Confirm password:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC vil lytte på denne porten på 127.0.0.1</translation>
+        <source>Password</source>
+        <translation>Passord</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;Advarsel:&lt;/b&gt; Disse innstillingene kan medføre risiko.</translation>
+        <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"/>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;KeePassHTTP er blitt gammeldags og vil bli fjerna i framtida.&lt;br&gt;Vennligst bytt til KeePassXC-nettleseren isteden! For hjelp med overgangen, besøk vår &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;overgangs-håndbok&lt;/a&gt;.&lt;/p&gt;</translation>
+        <source>Password cannot be empty.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Kan ikke bruke privilegerte porter</translation>
+        <source>Passwords do not match.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Kan ikke bruke privilegerte porter under 1024!
-Bruker standard port 19455.</translation>
+        <source>Generate master password</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3158,18 +3896,10 @@ Bruker standard port 19455.</translation>
         <translation>Ordliste:</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Antall ord:</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>Ord-skilletegn:</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>Lag passord</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Kopier</translation>
     </message>
@@ -3182,10 +3912,6 @@ Bruker standard port 19455.</translation>
         <translation>Lukk</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>Bruk</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>Entropi: %1 bit</translation>
     </message>
@@ -3213,6 +3939,171 @@ Bruker standard port 19455.</translation>
         <comment>Password quality</comment>
         <translation>Utmerket</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Avansert</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Slett</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Fjern</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Deaktiver</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3233,34 +4124,18 @@ Bruker standard port 19455.</translation>
         <translation>Kan ikke dekryptere melding</translation>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
-        <translation>Tidsavbrudd eller kan ikke koble til KeePassXC</translation>
-    </message>
-    <message>
         <source>Action cancelled or denied</source>
         <translation>Handlingen er kansellert eller avvist</translation>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation>Kan ikke kryptere melding eller offentlig nøkkel ikke funnet. Er lokal meldingsutveksling aktivert i KeePassXC?</translation>
-    </message>
-    <message>
         <source>KeePassXC association failed, try again</source>
         <translation>Assosiering av KeePassXC mislyktes, prøv igjen</translation>
     </message>
     <message>
-        <source>Key change was not successful</source>
-        <translation>Endring av nøkkel var ikke vellykket</translation>
-    </message>
-    <message>
         <source>Encryption key is not recognized</source>
         <translation>Krypteringsnøkkel er ikke gjenkjent</translation>
     </message>
     <message>
-        <source>No saved databases found</source>
-        <translation>Ingen lagrede databaser funnet</translation>
-    </message>
-    <message>
         <source>Incorrect action</source>
         <translation>Feil handling</translation>
     </message>
@@ -3386,10 +4261,6 @@ Bruker standard port 19455.</translation>
         <translation>Sett inn passord for å låse opp %1: </translation>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation>Klarte ikke å laste nøkkelfil %1 : %2</translation>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3473,12 +4344,6 @@ Tilgjengelige kommandoer:
         <translation>Feil ved lesing fra enhet</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>Tom fil !
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation>Ugyldig streng</translation>
     </message>
@@ -3487,30 +4352,6 @@ Tilgjengelige kommandoer:
         <translation>Manglende avsluttende anførselstegn</translation>
     </message>
     <message>
-        <source>AES: 256-bit</source>
-        <translation>AES: 256-bit</translation>
-    </message>
-    <message>
-        <source>Twofish: 256-bit</source>
-        <translation>Twofish: 256-bit</translation>
-    </message>
-    <message>
-        <source>ChaCha20: 256-bit</source>
-        <translation>ChaCha20: 256-bit</translation>
-    </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – anbefalt)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 4)</source>
-        <translation>AES-KDF (KDBX 4)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 3.1)</source>
-        <translation>AES-KDF (KDBX 3.1)</translation>
-    </message>
-    <message>
         <source>Group</source>
         <translation>Gruppe</translation>
     </message>
@@ -3539,10 +4380,6 @@ Tilgjengelige kommandoer:
         <translation>Oppretta</translation>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
-        <translation>Eldre nettlesertillegg</translation>
-    </message>
-    <message>
         <source>Browser Integration</source>
         <translation>Nettlesertillegg</translation>
     </message>
@@ -3571,10 +4408,6 @@ Tilgjengelige kommandoer:
         <translation>Antall ord i diceware-passordfrasen.</translation>
     </message>
     <message>
-        <source>count</source>
-        <translation>Antall</translation>
-    </message>
-    <message>
         <source>Wordlist for the diceware generator.
 [Default: EFF English]</source>
         <translation>Ordliste for diceware-generatoren.
@@ -3585,28 +4418,438 @@ Tilgjengelige kommandoer:
         <translation>Generer et nytt tilfeldig passord.</translation>
     </message>
     <message>
-        <source>Length of the generated password.</source>
-        <translation>Lengde på det genererte passordet.</translation>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
-        <translation>Bruk små bokstaver i det genererte passordet.</translation>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
-        <translation>Bruk store bokstaver i det genererte passordet.</translation>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
-        <translation>Bruk tall i det genererte passordet.</translation>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
-        <translation>Bruk spesialtegn i det genererte passordet.</translation>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
-        <translation>Bruk utvida ASCII i det lagde passordet.</translation>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation>Antall</translation>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256-bit</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256-bit</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256-bit</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – anbefalt)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>Fjern oppføring fra databasen.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>Sti til oppføring som skal fjernes.</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>Eksisterende enbrukermodus lock-fil er ugyldig. Starter ny instans.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Lock-filen kunne ikke opprettes. Enbrukermodus deaktivert.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - en multiplattforms passordhåndterer</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>Filnavn på passord-databasene som skal åpnes (*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>Sti til tilpasset konfigurasjonsfil</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>Database-nøkkelfil</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>Les database-passord fra standard input</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation>Foreldre-vindu handle</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>En annen instans av KeePassXC kjører allerede.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Alvorlig feil ved testing av de kryptografiske funksjonene.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Feil</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation>Databasepassord: </translation>
     </message>
 </context>
 <context>
@@ -3644,12 +4887,98 @@ Tilgjengelige kommandoer:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
+    <message>
+        <source>Agent connection failed.</source>
+        <translation>Agentforbindelse mislyktes.</translation>
+    </message>
     <message>
-        <source>Search...</source>
-        <translation>Søk...</translation>
+        <source>Agent protocol error.</source>
+        <translation>Agent protokollfeil.</translation>
     </message>
     <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation>Ingen agent kjører. Kan ikke identifisere.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation>Ingen agent kjører, kan ikke fjerne identitet.</translation>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation>Agent nektet denne identiteten. Mulige grunner er:</translation>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation>Nøkkelen er alt blitt lagt til.</translation>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation>Begrenset levetid støttes ikke av agenten (sjekk alternativene).</translation>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation>En bekreftelsesforespørsel støttes ikke av agenten (sjekk alternativene).</translation>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
         <source>Search</source>
         <translation>Søk</translation>
     </message>
@@ -3658,313 +4987,316 @@ Tilgjengelige kommandoer:
         <translation>Tøm</translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Versalsensitiv</translation>
-    </message>
-    <message>
         <source>Limit search to selected group</source>
         <translation>Avgrens søket til valgt gruppe</translation>
     </message>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Service</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC: Tilknytningsforespørsel for ny nøkkel.</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation>Du har mottatt en tilknytningsforespørsel for den ovennevnte nøkkelen.
-Gi den et unikt navn dersom du vil gi den tilgang til KeePassXC-databasen.</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: Overskrive eksisterende nøkkel?</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>En delt krypteringsnøkkel eksisterer allerede med navn &quot;%1&quot;.
-Ønsker du å overskrive den?</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: Oppdater oppføring.</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Vil du oppdatere informasjonen i %1 - %2?</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Database låst!</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Den aktive databasen er låst!
-Lås opp valgt database eller velg en annen som er åpen.</translation>
+        <source>Key:</source>
+        <translation>Nøkkel:</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Fjernet nøkler fra database</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation><numerusform>Fjerna %n krypteringsnøkkel(er) fra KeePassX/Http-oppføringa.</numerusform><numerusform>Fjerna %n krypteringsnøkkel(er) fra KeePassX/Http-oppføringa.</numerusform></translation>
+        <source>Generate</source>
+        <translation>Lag passord</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Ingen nøkler funnet</translation>
+        <source>Import</source>
+        <translation>Importer</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>Ingen delte krypteringsnøkler funnet i KeePassHttp-oppføringa.</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Innstillinger ikke tilgjengelig!</translation>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>Den aktive databasen mangler KeePassHttp-oppføring.</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>Fjerner lagrede tillatelser...</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>Avbryt</translation>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Fjernet tillatelser</translation>
+        <source>Remove</source>
+        <translation>Fjern</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation><numerusform>Fjernet tillatelser fra %n oppføring.</numerusform><numerusform>Fjernet tillatelser fra %n oppføringer.</numerusform></translation>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Ingen oppføring med tillatelser funnet!</translation>
+        <source>Status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Den aktive databasen inneholder ikke et oppsett med tillatelser.</translation>
+        <source>Fingerprint</source>
+        <translation>Fingeravtrykk</translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
-        <translation>Applikasjonsinnstillinger</translation>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Generell</translation>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>Sikkerhet</translation>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>Feil ved tilgang for filen %1</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>Grunnleggende</translation>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Tillat kun én instans av KeePassXC om gangen</translation>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>Husk de sist brukte databasene</translation>
+        <source>All files</source>
+        <translation>Alle filer</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Husk de sist brukte nøkkelfilene og kopibeskyttelsesnøklene</translation>
+        <source>Select path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Åpne sist brukte databaser ved oppstart</translation>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>Lagre automatisk ved avslutning </translation>
+        <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"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>Lagre automatisk etter hver endring</translation>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Last databasen automatisk på nytt hvis den blir endret eksternt </translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>Minimer ved kopi til utklippstavla</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Minimer ved programstart</translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>Bruk gruppeikon ved ny oppføring</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Ikke marker database som endret ved non-dataendringer (f.eks. ekspandere grupper)</translation>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
-        <translation>Skjul detaljvisninga</translation>
+        <source>Never</source>
+        <translation>Aldri</translation>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>Vis et ikon i systemkurven</translation>
+        <source>Always</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>Skjul vindu til systemkurven når minimert</translation>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
-        <translation>Skjul vindu til systemkurven i stedet for app-avslutning</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
-        <translation>Mørkt systemkurvikon</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Språk</translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Autoskriv</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>Bruk tittel i oppføringa for å matche vindu ved global Autoskriv</translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>Bruk URL i oppføringa for å matche vindu ved global Autoskriv</translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation>Alltid spør før utførelse av Autoskriv</translation>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Global Autoskriv-hurtigtast</translation>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>Autoskriv tidsforsinkelse</translation>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation>ms</translation>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
-        <translation>Oppstart</translation>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
-        <translation>Filhåndtering</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation>Sikker lagring av database-filer (kan være uforenelig med Dropbox, etc.)</translation>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
-        <translation>Sikkerhetskopier database-filen før lagring</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
-        <translation>Oppføringshåndtering</translation>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Generell</translation>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
-        <translation>Tidsavbrudd</translation>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>Slett utklippstavlen etter</translation>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>sek</translation>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>Lås databaser etter inaktivitet i</translation>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Bekvemmelighet</translation>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Lås databaser når økta låses eller lokket lukkes</translation>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>Lås databaser når vinduet minimeres</translation>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>TotpDialog</name>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>Ikke krev gjentakelse av passord ved klartekst-visning</translation>
+        <source>Timed Password</source>
+        <translation>Tidsbasert passord</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Vis passord i klartekst som standard</translation>
+        <source>000000</source>
+        <translation>000000</translation>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
-        <translation>Skjul passord i forhåndsvisnings-panelet</translation>
+        <source>Copy</source>
+        <translation>Kopier</translation>
+    </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
     <message>
-        <source>Hide entry notes by default</source>
-        <translation>Skjul notater i oppføringa som standard</translation>
+        <source>Copy</source>
+        <translation>Kopier</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>Personvern</translation>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>Bruk Google som reserve ved nedlasting av nettsted-ikon</translation>
+        <source>There was an error creating the QR code.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
-        <translation>Lås tidligere låst database etter utført Autoskriv</translation>
+        <source>Closing in %1 seconds.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation>Oppsett TOTP</translation>
@@ -3986,59 +5318,84 @@ Lås opp valgt database eller velg en annen som er åpen.</translation>
         <translation>Bruk selvvalgt oppsett</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>Merk: Endre disse innstillingene bare dersom du vet hva du gjør.</translation>
+        <source>Custom Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Time step:</source>
         <translation>Tidsintervall:</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8 siffer</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>sek</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>Kodestørrelse:</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6 siffer</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>Kodestørrelse:</translation>
+        <source>7 digits</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>sek</translation>
+        <source>8 digits</source>
+        <translation>8 siffer</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>Tidsbasert passord</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Kopier</translation>
+        <source>Close</source>
+        <translation>Lukk</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>Utløper om</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>sekunder</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>Lås opp databasen</translation>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4073,42 +5430,26 @@ Lås opp valgt database eller velg en annen som er åpen.</translation>
     </message>
 </context>
 <context>
-    <name>main</name>
-    <message>
-        <source>Remove an entry from the database.</source>
-        <translation>Fjern oppføring fra databasen.</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>Database-sti.</translation>
-    </message>
-    <message>
-        <source>Path of the entry to remove.</source>
-        <translation>Sti til oppføring som skal fjernes.</translation>
-    </message>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - en multiplattforms passordhåndterer</translation>
+        <source>Refresh</source>
+        <translation>Last på ny</translation>
     </message>
     <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>Filnavn på passord-databasene som skal åpnes (*.kdbx)</translation>
+        <source>YubiKey Challenge-Response</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>path to a custom config file</source>
-        <translation>Sti til tilpasset konfigurasjonsfil</translation>
+        <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"/>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>Database-nøkkelfil</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>Les database-passord fra standard input</translation>
-    </message>
-    <message>
-        <source>Parent window handle</source>
-        <translation>Foreldre-vindu handle</translation>
+        <source>No YubiKey inserted.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_nl_NL.ts b/share/translations/keepassx_nl_NL.ts
index cac860f97..cc8c2acdc 100644
--- a/share/translations/keepassx_nl_NL.ts
+++ b/share/translations/keepassx_nl_NL.ts
@@ -38,12 +38,6 @@
         <translation>Naar klembord kopiëren</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>Versie %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>Revisie: %1</translation>
     </message>
@@ -76,35 +70,48 @@ Kernelversie: %3 %4</translation>
         <translation>Een extra dank-u-wel van het KeePassXC-team voor debfx voor het creëren van het oorspronkelijke KeePassX.</translation>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
-        <translation>Bouwtype: %1
-</translation>
+        <source>Version %1</source>
+        <translation>Versie %1</translation>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP-toegang bevestigen</translation>
+        <source>Build Type: %1</source>
+        <translation>Bouwtype: %1</translation>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>Deze keuze onthouden</translation>
+        <source>Auto-Type</source>
+        <translation>Auto-type</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Toestaan</translation>
+        <source>Browser Integration</source>
+        <translation>Browserintegratie</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>Weigeren</translation>
+        <source>SSH Agent</source>
+        <translation>SSH-agent</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>%1 vraagt toegang tot jouw wachtwoorden voor het volgende).
-Geef aan of je toegang wilt verlenen of niet.</translation>
+        <source>YubiKey</source>
+        <translation>YubiKey</translation>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation>TouchID</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Geen</translation>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -113,6 +120,277 @@ Geef aan of je toegang wilt verlenen of niet.</translation>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>SSH-agent activeren (vereist herstart)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Programma-instellingen</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Algemeen</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Beveiliging</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Geen toegang tot configuratiebestand %1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Basisinstellingen</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>Opstarten</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Hoogstens een enkele instantie van KeePassXC starten</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Laatstgebruikte databases onthouden</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Laatstgebruikte sleutelbestanden en beveiligingsdongles onthouden</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Laatstgebruikte databases openen bij het opstarten</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>Scherm minimaliseren bij het opstarten</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>Bestandsbeheer</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation>Veilig opslaan van databasebestanden (mogelijk incompatibel met Dropbox, etc.)</translation>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation>Back-up databasebestand voor het opslaan</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Automatisch opslaan na iedere wijziging</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Automatisch opslaan bij afsluiten</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Markeer de database niet als gewijzigd voor non-data wijzigingen (bijv. uitgebreide groepen)</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Database automatisch opnieuw laden als deze van buitenaf is gewijzigd</translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>Itembeheer</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>Gebruik groepsicoon voor nieuwe items</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Minimaliseer bij kopiëren naar klembord</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation>Verberg voorvertoning</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Algemeen</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation>Verberg werkbalk (pictogrammen)</translation>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation>Minimaliseren in plaats van app afsluiten</translation>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Icoon in het systeemvak weergeven</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>Donker systeemvak-icoon</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Minimaliseren naar systeemvak</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Taal</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Auto-type</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>Gebruik naam van item als vensternaam voor Auto-type</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>Laat URL overeenkomen met item bij Auto-type</translation>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>Altijd vragen voor toepassen Auto-type</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Globale sneltoets voor Auto-type</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation>Auto-typevertraging</translation>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation>ms</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation>Auto-type start vertraging</translation>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>Time-outs</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>Klembord leegmaken na</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> sec</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>Databases vergrendelen na inactiviteit van</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation> min</translation>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation>Vergeet TouchID na inactiviteit van</translation>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>Gemak</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Databases vergrendelen als de gebruikerssessie wordt vergrendeld of bij het sluiten van de deksel</translation>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation>Vergeet TouchID wanneer sessie is vergrendeld of deksel is gesloten</translation>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>Databases vergrendelen bij het minimaliseren van het venster</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation>Vergrendelde database na Auto-type weer vergrendelen.</translation>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>Geen herhaling van wachtwoord vragen als deze zichtbaar is</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation>Wachtwoord niet verbergen tijdens bewerken</translation>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation>Tijdelijke aanduiding voor lege wachtwoordvelden niet gebruiken</translation>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation>Verberg wachtwoorden in voorvertoning</translation>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>Notities standaard verbergen</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>Privacy</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation>Gebruik DuckDuckGo voor het downloaden van de website-pictogrammen</translation>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -216,6 +494,27 @@ Geef aan of je toegang wilt verlenen of niet.</translation>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation>KeePassXC-browser: Item opslaan</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Oké</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuleren</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation>Je hebt meerdere databases open.
+Selecteer de database voor het opslaan van de inloggegevens.</translation>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -289,14 +588,6 @@ Geef aan of je toegang wilt verlenen of niet.</translation>
         <translation>Sorteer overeenkomende inloggegevens op &amp;gebruikersnaam</translation>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>&amp;Verbreek verbinding met alle browsers</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>Vergeet alle &amp;permissies</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>Geavanceerd</translation>
     </message>
@@ -345,7 +636,7 @@ Geef aan of je toegang wilt verlenen of niet.</translation>
     </message>
     <message>
         <source>Use a custom proxy location if you installed a proxy manually.</source>
-        <translation>Gebruik een aangepaste proxy-locatie als je een proxy handmatig hebt geïnstalleerd.</translation>
+        <translation>Gebruik een aangepaste proxy-locatie als je zelf een proxy hebt geïnstalleerd.</translation>
     </message>
     <message>
         <source>Use a &amp;custom proxy location</source>
@@ -362,14 +653,6 @@ Geef aan of je toegang wilt verlenen of niet.</translation>
         <translation>&lt;b&gt;Waarschuwing:&lt;/b&gt; De volgende opties kunnen gevaarlijk zijn!</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>Uitvoerbare bestanden (*.exe);; Alle bestanden (*.*)</translation>
-    </message>
-    <message>
-        <source>Executable Files (*)</source>
-        <translation>Uitvoerbare bestanden (*)</translation>
-    </message>
-    <message>
         <source>Select custom proxy location</source>
         <translation>Selecteer aangepaste proxy-locatie</translation>
     </message>
@@ -377,6 +660,32 @@ Geef aan of je toegang wilt verlenen of niet.</translation>
         <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
         <translation>Het spijt ons, maar KeePassXC-Browser wordt momenteel niet ondersteund voor Snap releases.</translation>
     </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation>KeePaasXC-Browser is nodig voor de browser integratie.
+Download hem voor %1 en %2.</translation>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation>&amp;Tor browser</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: </source>
+        <translation>&lt;b&gt;Waarschuwing&lt;/b&gt;, de keepassxc-proxy applicatie is niet gevonden!&lt;br /&gt;Controleer de installatie directory van KeePassXC of bevestig het aangepaste pad in geavanceerde opties.&lt;br /&gt;De browser integratie zal NIET WERKEN zonder de proxy application.&lt;br /&gt;Verwacht pad: </translation>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation>Uitvoerbare bestanden</translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation>Alle bestanden</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"/>
+    </message>
 </context>
 <context>
     <name>BrowserService</name>
@@ -417,152 +726,46 @@ Wil je deze overschrijven?</translation>
         <translation>Wil je de gegevens in %1 - %2 bijwerken?</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Database vergrendeld!</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>De actieve database is vergrendeld!
-Ontgrendel de geselecteerde database of kies een ontgrendelde database.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Instellingen niet beschikbaar!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation>De actieve database bevat geen instellingen.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Geen sleutels gevonden</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation>Geen gedeelde encryptiesleutels gevonden in KeePassXC-instellingen.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Sleutels uit database verwijderd</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation><numerusform>%n encryptie-sleutel verwijderd uit KeePassXC-instellingen.</numerusform><numerusform>%n encryptie-sleutels verwijderd uit KeePassXC-instellingen.</numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>Opgeslagen permissies verwijderen…</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>Afbreken</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Permissies verwijderd</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation><numerusform>Permissies zijn verwijderd uit %n item.</numerusform><numerusform>Permissies zijn verwijderd uit %n items.</numerusform></translation>
+        <source>Converting attributes to custom data…</source>
+        <translation>Kenmerken worden omgezet in speciala data...</translation>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Geen item met permissies gevonden!</translation>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation>KeePassXC: Geconverteerde KeePassHTTP kenmerken</translation>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>De actieve database bevat geen items met permissies.</translation>
-    </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>Wachtwoord</translation>
-    </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>Wachtwoord invoeren:</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>Wachtwoord herhalen:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;Sleutelbestand</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>Bladeren</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Aanmaken</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>Cha&amp;llenge/response</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Vernieuwen</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>Sleutelbestanden</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>Alle bestanden</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>Sleutelbestand aanmaken…</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>Het aanmaken van het sleutelbestand is mislukt:</translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>Kies een sleutelbestand</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Leeg wachtwoord</translation>
-    </message>
-    <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>Weet je zeker dat je geen wachtwoord wil gebruiken?</translation>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation>Kenmerken van %1 item(s) is/zijn geconverteerd.
+%2 sleutels naar speciale data verplaatst.</translation>
     </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>De wachtwoorden komen niet overeen.</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation><numerusform>Sleutel is verplaats naar speciale data.</numerusform><numerusform>Sleutels zijn verplaats naar speciale data.</numerusform></translation>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>Het instellen van %1 als sleutelbestand is mislukt:
-%2</translation>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation>KeePassXC: Geen item met KeePassHTTP kenmerken gevonden!</translation>
     </message>
     <message>
-        <source>Legacy key file format</source>
-        <translation>Verouderd sleutelbestandsformaat</translation>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation>De actieve database bevat geen item met KeePassHTTP attributen.</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>Je gebruikt een verouderd sleutelbestandsformaat dat in de toekomst niet ondersteund zal worden.
-
-Overweeg a.u.b. een nieuw sleutelbestand te genereren.</translation>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation>KeePassXC: instellingen voor oudere browserintegratie gedetecteerd</translation>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>Verandering sleutelbestand mislukt: geen YubiKey gedetecteerd.</translation>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation>Instellingen voor oudere browserintegratie gedetecteerd.
+Wil je de instellingen veranderen naar de nieuwste standaard?
+Dit is nodig om compatibiliteit met de browser plugin te behouden.</translation>
     </message>
 </context>
 <context>
@@ -643,14 +846,6 @@ Overweeg a.u.b. een nieuw sleutelbestand te genereren.</translation>
         <translation>Niet aanwezig in CSV-bestand</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>Lege veldnaam</translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>Kolom</translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>Geïmporteerd uit CSV-bestand</translation>
     </message>
@@ -659,48 +854,85 @@ Overweeg a.u.b. een nieuw sleutelbestand te genereren.</translation>
         <translation>Originele gegevens:</translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>Fout(en) gedetecteerd in CSV-bestand!</translation>
+        <source>Error</source>
+        <translation>Fout</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation>meer berichten overgeslagen]</translation>
+        <source>Empty fieldname %1</source>
+        <translation>Lege fieldname %1</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Fout</translation>
+        <source>column %1</source>
+        <translation>kolom %1</translation>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>CSV-import - fouten opgetreden:
-</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation>Fout(en) gevonden in CSV-bestand!</translation>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>Fout</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation><numerusform>[%n meer bericht(en) overgeslagen]</numerusform><numerusform>[%n meer bericht(en) overgeslagen]</numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Niet mogelijk om hoofdsleutel te berekenen</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation>CSV importeren: schrijver heeft fouten:
+%1</translation>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
-        <translation><numerusform>1 byte,</numerusform><numerusform>%n byte(s),</numerusform></translation>
+        <source>%n column(s)</source>
+        <translation><numerusform>1 kolom</numerusform><numerusform>%n kolom(men)</numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation>%1, %2, %3</translation>
     </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
-        <translation><numerusform>1 rij,</numerusform><numerusform>%n rij(en),</numerusform></translation>
+        <source>%n byte(s)</source>
+        <translation><numerusform>%n byte (s)</numerusform><numerusform>%n byte(s)</numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
-        <translation><numerusform>1 kolom</numerusform><numerusform>%n kolom(men)</numerusform></translation>
+        <source>%n row(s)</source>
+        <translation><numerusform>%n rij(en)</numerusform><numerusform>%n rij(en)</numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Alles</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>Bestand %1 bestaat niet.</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Kan bestand %1 niet openen.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation>Fout bij het lezen van de database: %1</translation>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation>Kan niet opslaan, database heeft geen bestandsnaam.</translation>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation>Bestand kan niet worden geschreven omdat het in de alleen-lezen modus is geopend.</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation>Ontgrendel database - KeePassXC</translation>
     </message>
 </context>
 <context>
@@ -730,14 +962,6 @@ Overweeg a.u.b. een nieuw sleutelbestand te genereren.</translation>
         <translation>Challenge/response:</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Niet mogelijk om de database te openen.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Niet mogelijk om het sleutelbestand te openen</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation>Verouderd sleutelbestandsformaat</translation>
     </message>
@@ -766,105 +990,173 @@ Overweeg a.u.b. een nieuw sleutelbestand te genereren.</translation>
         <source>Select key file</source>
         <translation>Kies sleutelbestand</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>Database repareren</translation>
+        <source>TouchID for quick unlock</source>
+        <translation>TouchID voor snel ontgrendelen</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Fout</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation>Kan database niet openen:
+%1</translation>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Niet mogelijk om het sleutelbestand te openen</translation>
+        <source>Can't open key file:
+%1</source>
+        <translation>Kan sleutelbestand niet openen:
+%1</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Niet mogelijk om de database te openen.</translation>
+        <source>Passwords</source>
+        <translation>Wachtwoorden</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Geavanceerde instellingen</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Algemeen</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Database zonder problemen geopend. Niets te doen.</translation>
+        <source>Security</source>
+        <translation>Beveiliging</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>Gelukt</translation>
+        <source>Master Key</source>
+        <translation>Hoofdsleutel</translation>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>De database is met succes gerepareerd
-Je kunt deze nu opslaan.</translation>
+        <source>Encryption Settings</source>
+        <translation>Versleuteling instellingen</translation>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>De database is niet te repareren.</translation>
+        <source>Browser Integration</source>
+        <translation>Browserintegratie</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>Algemeen</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation>KeePassXC-browser instellingen</translation>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>Versleuteling</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>&amp;Verbreek verbinding met alle browsers</translation>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Aantal iteraties te hoog</translation>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation type="unfinished"/>
     </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>Je gebruikt een zeer groot aantal sleuteltransformatie-iteratiesmet Argon2.
-
-Als je dit aantal aanhoudt, kan het uren, dagen (of zelfs langer) duren om de database te openen!</translation>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation>Verplaats KeePassHTTP kenmerken naar KeePassXC-browser &amp;speciale data</translation>
     </message>
     <message>
-        <source>Understood, keep number</source>
-        <translation>Begrepen, aantal aanhouden</translation>
+        <source>Stored keys</source>
+        <translation>Opgeslagen sleutels</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>Annuleren</translation>
+        <source>Remove</source>
+        <translation>Verwijderen</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Aantal iteraties te laag</translation>
+        <source>Delete the selected key?</source>
+        <translation>De geselecteerde sleutel verwijderen?</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>Je gebruikt een zeer laag aantal sleuteltransformatie-iteraties met AES-KDF.
-
-Als je dit aantal aanhoudt is het mogelijk heel gemakkelijk om de database te kraken!</translation>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation>Wil je de geselecteerde sleutel echt verwijderen?
+Hierdoor werkt de verbinding met de browser plugin mogelijk niet meer.</translation>
     </message>
     <message>
-        <source>KDF unchanged</source>
-        <translation>KDF ongewijzigd</translation>
+        <source>Key</source>
+        <translation>Sleutel</translation>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
-        <translation>Het transformeren van de sleutel met de nieuwe KDF-parameters is mislukt; KDF is ongewijzigd.</translation>
+        <source>Value</source>
+        <translation>Waarde</translation>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation>Activeer browser integratie om deze instellingen te kunnen wijzigen.</translation>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation>Verbreek verbinding met alle browsers</translation>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation>Wil je echt de verbinding met alle browsers verbreken?
+Hierdoor werkt de verbinding met de browser plugin mogelijk niet meer.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Geen sleutels gevonden</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation>Geen gedeelde coderingssleutels gevonden in KeePassXC instellingen.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Sleutels uit database verwijderd</translation>
     </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
-        <translation><numerusform>MiB</numerusform><numerusform>MiB</numerusform></translation>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation><numerusform>%n coderingssleutel uit KeePassXC instellingen verwijderd.</numerusform><numerusform>%n coderingssleutel(s) uit KeePassXC instellingen verwijderd.</numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Opgeslagen permissies verwijderen…</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Afbreken</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Permissies verwijderd</translation>
     </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
-        <translation><numerusform>executie-thread</numerusform><numerusform> executie-thread(s)</numerusform></translation>
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: Geen item met permissies gevonden!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>De actieve database bevat geen items met permissies.</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation>Verplaats KeePassHTTP kenmerken naar speciale data</translation>
+    </message>
+    <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>Wil je echt alle instellingen voor de oudere browserintegratie veranderen naar de nieuwste standaard?
+Dit is nodig om compatibiliteit met de browser plugin te behouden.</translation>
     </message>
 </context>
 <context>
@@ -901,6 +1193,113 @@ Als je dit aantal aanhoudt is het mogelijk heel gemakkelijk om de database te kr
         <source>Parallelism:</source>
         <translation>Parallelliteit:</translation>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation>Decoderingstijd:</translation>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation>?? s</translation>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation>Wijzigen</translation>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation>100 ms</translation>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation>5 s</translation>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation>Hogere waarden bieden meer bescherming, maar laten het openen van de database langer duren.</translation>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation>Database-indeling:</translation>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation>Dit is alleen van belang als je de database met andere programma&apos;s wil gebruiken.</translation>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation>KDBX 4.0 (aanbevolen)</translation>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation>KDBX 3.1</translation>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation>ongewijzigd</translation>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Aantal iteraties te hoog</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>Je gebruikt een zeer groot aantal sleuteltransformatie-iteratiesmet Argon2.
+
+Als je dit aantal aanhoudt, kan het uren, dagen (of zelfs langer) duren om de database te openen!</translation>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation>Begrepen, aantal aanhouden</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuleren</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Aantal iteraties te laag</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>Je gebruikt een zeer laag aantal sleuteltransformatie-iteraties met AES-KDF.
+
+Als je dit aantal aanhoudt is het mogelijk heel gemakkelijk om de database te kraken!</translation>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation>KDF ongewijzigd</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation>Het transformeren van de sleutel met de nieuwe KDF-parameters is mislukt; KDF is ongewijzigd.</translation>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation><numerusform> MiB</numerusform><numerusform> MiB</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation><numerusform>thread(s)</numerusform><numerusform>thread(s)</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation><numerusform>%1 ms</numerusform><numerusform>%1 ms</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -950,91 +1349,112 @@ Als je dit aantal aanhoudt is het mogelijk heel gemakkelijk om de database te kr
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>Alles</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2-database</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Alle bestanden</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Database openen</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>Bestand niet gevonden!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Het is niet mogelijk om de database te openen.</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>Bestand geopend in lees-modus.</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>CSV-bestand openen</translation>
+        <source>Add additional protection...</source>
+        <translation>Extra beveiliging toevoegen...</translation>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>CSV-bestand</translation>
+        <source>No encryption key added</source>
+        <translation>Geen coderingssleutel toegevoegd</translation>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>Alle bestanden (*)</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation>Je moet minstens één coderingssleutel aan uw database toevoegen om deze te beveiligen!</translation>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Database samenvoegen</translation>
+        <source>No password set</source>
+        <translation>Geen wachtwoord ingesteld</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>KeePass 1-database openen</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>WAARSCHUWING! Je hebt geen wachtwoord ingesteld. Een database gebruiken zonder wachtwoord wordt sterk afgeraden!
+
+Weet je zeker dat je door wilt gaan zonder wachtwoord?</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1-database</translation>
+        <source>Unknown error</source>
+        <translation>Onbekende fout</translation>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>Sluiten?</translation>
+        <source>Failed to change master key</source>
+        <translation>Hoofdsleutel wijzigen is niet gelukt</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; is gewijzigd.
-Wijzigingen ongedaan maken en doorgaan met sluiten?</translation>
+        <source>Database Name:</source>
+        <translation>Database naam:</translation>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>Wijzigingen opslaan?</translation>
+        <source>Description:</source>
+        <translation>Beschrijving:</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>&quot;%1&quot; is gewijzigd.
-Wijzigingen opslaan?</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2-database</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Het opslaan van de database is mislukt.</translation>
+        <source>All files</source>
+        <translation>Alle bestanden</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Wachtwoorden</translation>
+        <source>Open database</source>
+        <translation>Database openen</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Database Opslaan Als</translation>
+        <source>CSV file</source>
+        <translation>CSV-bestand</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>Database samenvoegen</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>KeePass 1-database openen</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1-database</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1045,40 +1465,41 @@ Wijzigingen opslaan?</translation>
         <translation>Schrijven van het CSV-bestand mislukt.</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>Nieuwe database</translation>
+        <source>Database creation error</source>
+        <translation>Fout bij creëren van de database:</translation>
     </message>
     <message>
-        <source>locked</source>
-        <translation>vergrendeld</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>De aangemaakte database heeft geen sleutel of KDF, dit weiger ik op te slaan.
+Dit is zeker een bug, rapporteer dit a.u.b. aan de ontwikkelaars.</translation>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>Database vergrendelen</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation>Het databasebestand bestaat niet of is niet toegankelijk.</translation>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>Kan de database niet vergrendelen omdat deze momenteel bewerkt wordt.
-Druk op annuleren om je wijzigingen te voltooien of af te danken.</translation>
+        <source>Select CSV file</source>
+        <translation>Selecteer CSV-bestand</translation>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>Deze database is gewijzigd.
-Wil je de database opslaan voordat je deze vergrendelt?
-Zo nee, dan gaan de wijzigingen verloren.</translation>
+        <source>New Database</source>
+        <translation>Nieuwe database</translation>
     </message>
     <message>
-        <source>Disable safe saves?</source>
-        <translation>Veilig opslaan uitschakelen?</translation>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [nieuwe database]</translation>
     </message>
     <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 heeft meerdere keren geprobeerd de database op te slaan. Dit wordt waarschijnlijk veroorzaakt door een blokkade op het bestand door een synchronisatie-dienst.
-Veilig opslaan afschakelen en opnieuw proberen?</translation>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [vergrendeld]</translation>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [alleen lezen]</translation>
     </message>
 </context>
 <context>
@@ -1088,37 +1509,13 @@ Veilig opslaan afschakelen en opnieuw proberen?</translation>
         <translation>Bezig met zoeken…</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>Hoofdsleutel wijzigen</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>Item verwijderen?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>Weet je zeker dat je het item &quot;%1&quot; definitief wil verwijderen?</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Items wissen?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Weet je zeker dat je %1 items wil wissen?</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Wilt u het item naar de prullenbak verplaatsen?</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation>Weet je zeker dat je item &quot;%1&quot; naar de prullenbak wil verplaatsen?</translation>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Items naar de prullenbak verplaatsen?</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation><numerusform>Wil je echt %n item naar de Prullenbak verplaatsen?</numerusform><numerusform>Wil je echt %n item(s) naar de Prullenbak verplaatsen?</numerusform></translation>
@@ -1136,18 +1533,10 @@ Veilig opslaan afschakelen en opnieuw proberen?</translation>
         <translation>Mijn keuze onthouden</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Groep verwijderen?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>Weet je zeker dat je de groep &quot;%1&quot; wil verwijderen?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Niet mogelijk om hoofdsleutel te berekenen</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>Geen actuele database.</translation>
     </message>
@@ -1182,10 +1571,6 @@ Do you want to merge your changes?</source>
 Wil je de wijzigingen samenvoegen?</translation>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>De nieuwe database kan niet worden geopend tijdens het automatisch herladen van deze database.</translation>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>Prullenbak legen?</translation>
     </message>
@@ -1193,88 +1578,107 @@ Wil je de wijzigingen samenvoegen?</translation>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>Weet je zeker dat je alles uit de prullenbak definitief wil verwijderen?</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>TOTP-token genereren</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation><numerusform>Wilt u echt %n item(s) voorgoed verwijderen?</numerusform><numerusform>Wilt u echt %n item(s) voorgoed verwijderen?</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation><numerusform>Verwijderen entry(s)?</numerusform><numerusform>Item(s) verwijderen?</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation><numerusform>Item(s) naar prullenbak verplaatsen?</numerusform><numerusform>Item(s) naar prullenbak verplaatsen?</numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Sluiten</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Bestand geopend in lees-modus.</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Algemeen</translation>
+        <source>Lock Database?</source>
+        <translation>Database vergrendelen?</translation>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Wachtwoord</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation>Je bewerkt een item. De wijzigingen verwerpen en toch vergrendelen?</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot; is gewijzigd.
+Wijzigingen opslaan?</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>Vervaldatum</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation>Database is gewijzigd.
+Wijzigingen opslaan?</translation>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Gebruikersnaam</translation>
+        <source>Save changes?</source>
+        <translation>Wijzigingen opslaan?</translation>
     </message>
     <message>
-        <source>Autotype</source>
-        <translation>Auto-type</translation>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation>Kan het nieuwe databasebestand niet openen tijdens het automatisch herladen.
+Fout: %1</translation>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>Zoeken</translation>
+        <source>Disable safe saves?</source>
+        <translation>Veilig opslaan uitschakelen?</translation>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>Kenmerken</translation>
+        <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 heeft meerdere keren geprobeerd de database op te slaan. Dit wordt waarschijnlijk veroorzaakt door een blokkade op het bestand door een synchronisatie-dienst.
+Veilig opslaan afschakelen en opnieuw proberen?</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Bijlagen</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation>Het schrijven van de database is mislukt.
+%1</translation>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Notities</translation>
+        <source>Passwords</source>
+        <translation>Wachtwoorden</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>Venster</translation>
+        <source>Save database as</source>
+        <translation>Database Opslaan Als</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>Tekenreeks</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2-database</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Zoeken</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Wissen</translation>
+        <source>Delete group</source>
+        <translation>Verwijder groep</translation>
     </message>
     <message>
-        <source>Never</source>
-        <translation>Nooit</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[BEVEILIGD]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>Uitgeschakeld</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Geactiveerd</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1348,22 +1752,10 @@ Wil je de wijzigingen samenvoegen?</translation>
         <translation>Nieuw kenmerk</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Verwijdering bevestigen</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>Weet je zeker dat je dit kenmerk wil verwijderen?</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[BEVEILIGD]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation>Druk Tonen om te bekijken of bewerken</translation>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>Morgen</translation>
     </message>
@@ -1376,10 +1768,6 @@ Wil je de wijzigingen samenvoegen?</translation>
         <translation><numerusform>%n maand</numerusform><numerusform>%n maanden</numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 jaar</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation>Gegenereerd wachtwoord toepassen?</translation>
     </message>
@@ -1391,6 +1779,26 @@ Wil je de wijzigingen samenvoegen?</translation>
         <source>Entry updated successfully.</source>
         <translation>Het item is bijgewerkt.</translation>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation>Het item heeft niet opgeslagen wijzigingen</translation>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation>Nieuw kenmerk %1</translation>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation>[BEVEILIGD] Klik toon om de kijken of wijzigen</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n jaar</numerusform><numerusform>%n jaren</numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1636,6 +2044,81 @@ Wil je de wijzigingen samenvoegen?</translation>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulier</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Wachtwoord:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1693,10 +2176,6 @@ Wil je de wijzigingen samenvoegen?</translation>
         <translation>Favicon kan niet worden opgehaald.</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Tip: Je kunt Google gebruiken als alternatief via Extra&gt;Instellingen&gt;Beveiliging</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>Afbeeldingen</translation>
     </message>
@@ -1705,24 +2184,44 @@ Wil je de wijzigingen samenvoegen?</translation>
         <translation>Alle bestanden</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Kies afbeelding</translation>
+        <source>Custom icon already exists</source>
+        <translation>Icoon bestaat al</translation>
     </message>
     <message>
-        <source>Can&apos;t read icon</source>
-        <translation>Kan icoon niet lezen</translation>
+        <source>Confirm Delete</source>
+        <translation>Verwijdering bevestigen</translation>
     </message>
     <message>
-        <source>Custom icon already exists</source>
-        <translation>Aangepast icoon bestaat al</translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation>Icon is gedownload</translation>
     </message>
     <message>
-        <source>Confirm Delete</source>
-        <translation>Verwijdering bevestigen</translation>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>Tip: Je kunt DuckDuckGo als alternatief inschakelen onder Extra&gt;Instellingen&gt;Beveiliging</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>Dit icoon wordt gebruikt door %1 items en zal worden vervangen door de standaardicoon. Weet je zeker dat je het wil verwijderen?</translation>
+        <source>Select Image(s)</source>
+        <translation>Selecteer afbeelding(en)</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation><numerusform>%1 van %n pictogram(men) geladen</numerusform><numerusform>%1 van %n pictogram(men) geladen</numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation>Geen pictogrammen werden geladen</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation><numerusform>%n pictogram(men) al aanwezig in de database</numerusform><numerusform>%n pictogram(men) al aanwezig in de database</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation><numerusform>De volgende pictogram(men) mislukten:</numerusform><numerusform>De volgende pictogram(men) mislukten:</numerusform></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>Dit pictogram wordt gebruikt door %n item(s) en zal worden vervangen door het standaardpictogram. Weet je zeker dat je het wilt verwijderen?</numerusform><numerusform>Dit pictogram wordt gebruikt door %n item(s) en zal worden vervangen door het standaardpictogram. Weet je zeker dat je het wilt verwijderen?</numerusform></translation>
     </message>
 </context>
 <context>
@@ -1773,9 +2272,8 @@ Hierdoor werken de plugins mogelijk niet meer goed.</translation>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation>- Kloon</translation>
+        <source>%1 - Clone</source>
+        <translation>%1 - kloon</translation>
     </message>
 </context>
 <context>
@@ -1820,10 +2318,6 @@ Hierdoor werken de plugins mogelijk niet meer goed.</translation>
         <translation><numerusform>Weet je zeker dat je %n bijlage wil verwijderen?</numerusform><numerusform>Weet je zeker dat je %n bijlagen wil verwijderen?</numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Verwijdering bevestigen</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>Bijlagen opslaan</translation>
     </message>
@@ -1860,10 +2354,13 @@ Hierdoor werken de plugins mogelijk niet meer goed.</translation>
 %1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation>Verwijderen bevestigen</translation>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>Bestanden niet kunnen openen:
-%1</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1947,6 +2444,106 @@ Hierdoor werken de plugins mogelijk niet meer goed.</translation>
         <source>Attachments</source>
         <translation>Bijlagen</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>Ja</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>TOTP-token genereren</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Sluiten</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Algemeen</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Gebruikersnaam</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Wachtwoord</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Vervaldatum</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>Kenmerken</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Bijlagen</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notities</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Auto-type</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Venster</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Tekenreeks</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Zoeken</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Zoeken</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Wissen</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Nooit</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[BEVEILIGD]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Geactiveerd</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Uitgeschakeld</translation>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EntryView</name>
@@ -1985,6 +2582,19 @@ Hierdoor werken de plugins mogelijk niet meer goed.</translation>
         <source>Recycle Bin</source>
         <translation>Prullenbak</translation>
     </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation>[leeg]</translation>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>HostInstaller</name>
@@ -1998,61 +2608,6 @@ Hierdoor werken de plugins mogelijk niet meer goed.</translation>
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>Lengte:</translation>
-    </message>
-    <message>
-        <source>Character Types</source>
-        <translation>Tekens</translation>
-    </message>
-    <message>
-        <source>Upper Case Letters</source>
-        <translation>Hoofdletters</translation>
-    </message>
-    <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
-    </message>
-    <message>
-        <source>Lower Case Letters</source>
-        <translation>Kleine letters</translation>
-    </message>
-    <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
-    </message>
-    <message>
-        <source>Numbers</source>
-        <translation>Cijfers</translation>
-    </message>
-    <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
-    </message>
-    <message>
-        <source>Special Characters</source>
-        <translation>Speciale tekens</translation>
-    </message>
-    <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; …</translation>
-    </message>
-    <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Op elkaar lijkende tekens uitsluiten</translation>
-    </message>
-    <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>Zorg ervoor dat het wachtwoord tekens uit iedere groep bevat</translation>
-    </message>
-    <message>
-        <source>Extended ASCII</source>
-        <translation>Uitgebreide ASCII</translation>
-    </message>
-</context>
-<context>
     <name>KMessageWidget</name>
     <message>
         <source>&amp;Close</source>
@@ -2077,6 +2632,26 @@ Hierdoor werken de plugins mogelijk niet meer goed.</translation>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Verkeerde sleutel of beschadigde database.</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation>ontbrekende database-koppen</translation>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation>Header komt niet overeen met hash</translation>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>Ongeldige grootte van header-ID</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>Ongeldige lengte van header-veld</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>Ongeldige lengte van header-data</translation>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2159,22 +2734,22 @@ Hierdoor werken de plugins mogelijk niet meer goed.</translation>
     <message>
         <source>Invalid variant map entry name length</source>
         <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
-        <translation>Ongeldige lengte van de variant map entry</translation>
+        <translation>Ongeldige lengte van een variant map item naam</translation>
     </message>
     <message>
         <source>Invalid variant map entry name data</source>
         <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
-        <translation>Ongeldige data in de variant map entry name</translation>
+        <translation>Ongeldige data in een variant map item naam</translation>
     </message>
     <message>
         <source>Invalid variant map entry value length</source>
         <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
-        <translation>Ongeldige lengte van de variant map waarde</translation>
+        <translation>Ongeldige lengte van een variant map waarde</translation>
     </message>
     <message>
         <source>Invalid variant map entry value data</source>
         <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
-        <translation>Ongeldige data in de variant map waarde</translation>
+        <translation>Ongeldige data in een variant map waarde</translation>
     </message>
     <message>
         <source>Invalid variant map Bool entry value length</source>
@@ -2236,10 +2811,6 @@ Hierdoor werken de plugins mogelijk niet meer goed.</translation>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation>Ongeldige lengte versleuteling uuid</translation>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation>Niet ondersteund versleutelingsalgoritme</translation>
     </message>
@@ -2293,6 +2864,18 @@ Deze actie is niet omkeerbaar. Je kunt de geïmporteerde database niet meer open
         <source>Unsupported KeePass 2 database version.</source>
         <translation>Niet-ondersteunde KeePass 2-databaseversie.</translation>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation>Ongeldige cipher uuid lengte: %1 (lengte=2%)</translation>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation>Geen geldige UUID: %1</translation>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2365,10 +2948,6 @@ Deze actie is niet omkeerbaar. Je kunt de geïmporteerde database niet meer open
         <translation>Geschiedenis element met ander uuid</translation>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation>Het is niet gelukt om de tekst te ontcijferen</translation>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation>Duplicaat aangepast kenmerk gevonden</translation>
     </message>
@@ -2417,6 +2996,14 @@ Deze actie is niet omkeerbaar. Je kunt de geïmporteerde database niet meer open
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation>Het is niet gelukt om de binary uit te pakken</translation>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation>XML fout:
+%1
+Lijn %2, kolom %3</translation>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2580,28 +3167,129 @@ Deze actie is niet omkeerbaar. Je kunt de geïmporteerde database niet meer open
         <source>Invalid entry field type</source>
         <translation>Ongeldig item veldtype</translation>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation>niet in staat om naar positie te springen</translation>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>Het bestaande single-instance vergrendelingsbestand is niet geldig. Een nieuwe instantie wordt gestart.</translation>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>Het vergrendelingsbestand kon niet worden aangemaakt. Single-instance mode uitgeschakeld.</translation>
+        <source>Import from</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Een andere instantie van KeePassXC is reeds gestart.</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Fatale fout bij het testen van de cryptografische functies.</translation>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Fout</translation>
+        <source>Key Component</source>
+        <translation>Sleutelcomponent</translation>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation>Sleutelcomponent beschrijving</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuleren</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation>Sleutelcomponent verzameling, klik om te wijzigen of verwijderen</translation>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation>Toevoegen van %1</translation>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation>Wijzigen van %1</translation>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation>Verwijder %1</translation>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation>%1 ingesteld, klik om te wijzigen of verwijderen</translation>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>Bladeren</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Genereren</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation>Sleutelbestand</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;Je kunt een sleutelbestand toevoegen met willekeurige bytes voor extra veiligheid.&lt;/p&gt; &lt;p&gt;Je moet het sleutelbestand geheim houden en nooit verliezen anders wordt je buiten gesloten!&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation>Verouderd sleutelbestandsformaat</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>Je gebruikt een verouderd sleutelbestandsformaat dat in de toekomst niet ondersteund zal worden.
+
+Ga a.u.b. naar de hoofdsleutel instellingen en genereer een nieuw sleutelbestand.</translation>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation>Er ging iets fout bij het laden van het sleutelbestand &apos;%1&apos;
+Bericht: %2</translation>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Sleutelbestanden</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Alle bestanden</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Sleutelbestand aanmaken…</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation>Er ging iets fout bij het maken van het sleutelbestand</translation>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation>Kan sleutelbestand niet maken: %1</translation>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Kies een sleutelbestand</translation>
     </message>
 </context>
 <context>
@@ -2615,10 +3303,6 @@ Deze actie is niet omkeerbaar. Je kunt de geïmporteerde database niet meer open
         <translation>&amp;Recente databases</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Importeren</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
@@ -2627,14 +3311,6 @@ Deze actie is niet omkeerbaar. Je kunt de geïmporteerde database niet meer open
         <translation>Items</translation>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>Kenmerk naar klembord kopiëren</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation>Tijd-gebaseerd eenmalig wachtwoord</translation>
-    </message>
-    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Groepen</translation>
     </message>
@@ -2663,30 +3339,10 @@ Deze actie is niet omkeerbaar. Je kunt de geïmporteerde database niet meer open
         <translation>Database &amp;Sluiten</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>&amp;Nieuwe database</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>KeePassX database samenvoegen</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>Nieuw item toe&amp;voegen</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>Item &amp;Bekijken/bewerken</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>Item &amp;Verwijderen</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>Nieuwe groep Toe&amp;voegen</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>Groep B&amp;ewerken</translation>
     </message>
@@ -2699,14 +3355,6 @@ Deze actie is niet omkeerbaar. Je kunt de geïmporteerde database niet meer open
         <translation>Database Opslaan &amp;Als…</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>&amp;Hoofdwachtwoord wijzigen…</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>&amp;Database-instellingen</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>Database-instellingen</translation>
     </message>
@@ -2715,10 +3363,6 @@ Deze actie is niet omkeerbaar. Je kunt de geïmporteerde database niet meer open
         <translation>Item &amp;Klonen</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>&amp;Zoeken</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>&amp;Gebruikersnaam kopiëren</translation>
     </message>
@@ -2727,10 +3371,6 @@ Deze actie is niet omkeerbaar. Je kunt de geïmporteerde database niet meer open
         <translation>Gebruikersnaam naar klembord kopiëren</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>Wachtwoord kopiëren</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>Wachtwoord naar klembord kopiëren</translation>
     </message>
@@ -2743,14 +3383,6 @@ Deze actie is niet omkeerbaar. Je kunt de geïmporteerde database niet meer open
         <translation>Wachtwoordgenerator</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation>Auto-type uit&amp;voeren</translation>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>URL &amp;Openen</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>Databases &amp;Vergrendelen</translation>
     </message>
@@ -2783,22 +3415,6 @@ Deze actie is niet omkeerbaar. Je kunt de geïmporteerde database niet meer open
         <translation>&amp;Exporteren naar CSVbestand…</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Importeer een KeePass 1-database…</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>Importeer een CSV-bestand…</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Database Re&amp;pareren…</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>TOTP weergeven</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>TOTP instellen…</translation>
     </message>
@@ -2819,14 +3435,6 @@ Deze actie is niet omkeerbaar. Je kunt de geïmporteerde database niet meer open
         <translation>Geen toegang tot configuratiebestand %1</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Het lijkt erop dat je KeePassHTTP voor integratie met de browser gebruikt. Deze functie is verouderd en zal worden verwijderd. &lt;br&gt;Schakel a.u.b. over naar KeePassXC-Browser! Voor hulp bij migratie, bezoek onze &lt;a class=&quot;link&quot; href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt; migratiehandleiding&lt;/a&gt; (waarschuwing %1 van 3).&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>alleen-lezen</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
@@ -2839,36 +3447,278 @@ Deze actie is niet omkeerbaar. Je kunt de geïmporteerde database niet meer open
         <translation>KeePassXC afsluiten</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2-database</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Druk de knop op uw YubiKey!</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Alle bestanden</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation>WAARSCHUWING: Je gebruikt een niet-stabiele versie van KeePassXC!
+Deze versie is niet bedoeld voor dagelijks gebruik.
+Er is een hoog risico op beschadiging. Bewaar een back-up van jouw databases.</translation>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Database openen</translation>
+        <source>&amp;Donate</source>
+        <translation>&amp; Doneren</translation>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Gerepareerde database opslaan</translation>
+        <source>Report a &amp;bug</source>
+        <translation>Rapporteer een &amp;bug</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Opslaan van de database is mislukt.</translation>
+        <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>WAARSCHUWING: Jouw Qt-versie kan KeePassXC laten crashen bij gebruik van een schermtoetsenbord!
+Wij raden je aan om de AppImage te gebruiken welke beschikbaar is op onze downloadpagina.</translation>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Druk de knop op uw YubiKey!</translation>
+        <source>&amp;Import</source>
+        <translation>&amp;Importeer</translation>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
-        <translation>WAARSCHUWING: Je gebruikt een niet-stabiele versie van KeePassXC!
-Deze versie is niet bedoeld voor dagelijks gebruik.
-Er is een hoog risico op beschadiging. Bewaar een back-up van jouw databases.</translation>
+        <source>Copy att&amp;ribute...</source>
+        <translation>Kopieer &amp;kenmerk...</translation>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation>TOTP...</translation>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation>&amp;Nieuwe database...</translation>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation>Een nieuwe database maken</translation>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation>&amp;Nieuw item</translation>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation>Een nieuw item toevoegen</translation>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation>&amp;Edit item</translation>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation>Bekijk/bewerk item</translation>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation>&amp;Hoofdsleutel veranderen</translation>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation>&amp;Wachtwoord kopiëren</translation>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation>Toon TOTP…</translation>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation>Toon TOTP QR code...</translation>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation>Ouder doel item is opnieuw toegepast over nieuwer bron item %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation>Ouder bron item is opnieuw toegepast over nieuwer doel item %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Alles</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Geavanceerde instellingen</translation>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <translation>Versleuteling instellingen</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 type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation>Database hoofdsleutel</translation>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation>Een hoofdsleutel die alleen aan jou bekend is beschermt de database.</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2971,125 +3821,34 @@ Er is een hoog risico op beschadiging. Bewaar een back-up van jouw databases.</t
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation>Dialoog</translation>
-    </message>
-    <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>Dit wordt vereist om toegang te krijgen tot jouw databases vanaf ChromeIPass of PassIFox</translation>
-    </message>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>KeePassHTTP-server activeren</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Algemeen</translation>
-    </message>
-    <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>Toon een melding wanneer inloggegevens worden aangevraagd</translation>
-    </message>
-    <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>Levert alleen de beste overeenkomsten voor een specifieke URL in plaats van alle invoer voor het hele domein.</translation>
-    </message>
-    <message>
-        <source>&amp;Return only best matching entries</source>
-        <translation>Lever alleen de best ove&amp;reenkomende items</translation>
-    </message>
-    <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Verzoek om database te ontgrendelen</translation>
-    </message>
-    <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation>Lever alleen items van hetzelfde schema (http://, https://, ftp://, …).</translation>
-    </message>
-    <message>
-        <source>&amp;Match URL schemes</source>
-        <translation>&amp;Vergelijk URL sche&amp;ma&apos;s</translation>
-    </message>
-    <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Sorteer items op $gebruikersnaam</translation>
-    </message>
-    <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Sorteer items op &amp;naam</translation>
-    </message>
-    <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>Verwijder alle gedeelde encryptiesleutels uit de actieve database</translation>
-    </message>
-    <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>Verwijder alle opgeslagen permissies van items uit de actieve database</translation>
-    </message>
-    <message>
-        <source>Password Generator</source>
-        <translation>Wachtwoordgenerator</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Geavanceerd</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Altijd &amp;toegang verlenen tot items</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Altijd &amp;bewerken toestaan op items</translation>
-    </message>
-    <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>Alleen de geselecteerde database hoeft verbonden te zijn.</translation>
-    </message>
-    <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Zoek in alle geopende databases naar overeenkomende items</translation>
-    </message>
-    <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>Het automatisch aanmaken of wijzigen van tekenreeks-velden wordt niet ondersteund.</translation>
-    </message>
-    <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>Lever &amp;geavanceerde tekenreeks-velden die met &quot;KPH: &quot; beginnen.</translation>
-    </message>
-    <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP-poort:</translation>
+        <source>Enter password:</source>
+        <translation>Wachtwoord invoeren:</translation>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Standaard poort: 19455</translation>
+        <source>Confirm password:</source>
+        <translation>Bevestig wachtwoord:</translation>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC zal deze poort op 127.0.0.1 beluisteren</translation>
+        <source>Password</source>
+        <translation>Wachtwoord</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;Waarschuwing:&lt;/b&gt; De volgende opties kunnen gevaarlijk zijn!</translation>
+        <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;Een wachtwoord is de primaire methode voor het beveiligen van een database.&lt;/p&gt; &lt;p&gt;Goede wachtwoorden zijn lang en uniek. KeePassXC kan er een voor je genereren.&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;KeePassHTTP is verouderd en wordt in de toekomst verwijderd. &lt;br&gt;Schakel a.u.b. over naar KeePassXC-Browser! Voor hulp bij migratie, bezoek onze &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt; migratiehandleiding&lt;/a&gt;.&lt;/p&gt;</translation>
+        <source>Password cannot be empty.</source>
+        <translation>Wachtwoord mag niet leeg zijn.</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Kan niet koppelen op bevoorrechte poorten</translation>
+        <source>Passwords do not match.</source>
+        <translation>Wachtwoorden komen niet overeen.</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Kan niet koppelen naar bevoorrechte poorten onder 1024!
-Standaardpoort 19455 wordt gebruikt.</translation>
+        <source>Generate master password</source>
+        <translation>Genereer een hoofdwachtwoord</translation>
     </message>
 </context>
 <context>
@@ -3141,11 +3900,11 @@ Standaardpoort 19455 wordt gebruikt.</translation>
     </message>
     <message>
         <source>Exclude look-alike characters</source>
-        <translation>Op elkaar lijkende tekens uitsluiten</translation>
+        <translation>Op elkaar lijkende tekens niet gebruiken</translation>
     </message>
     <message>
         <source>Pick characters from every group</source>
-        <translation>Zorg dat het wachtwoord tekens uit iedere groep bevat</translation>
+        <translation>Gebruik tekens uit iedere groep</translation>
     </message>
     <message>
         <source>&amp;Length:</source>
@@ -3160,18 +3919,10 @@ Standaardpoort 19455 wordt gebruikt.</translation>
         <translation>Woordenlijst:</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Aantal woorden:</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>Scheidingsteken:</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>Genereren</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Kopiëren</translation>
     </message>
@@ -3184,10 +3935,6 @@ Standaardpoort 19455 wordt gebruikt.</translation>
         <translation>Sluiten</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>Toepassen</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>Entropie: %1 bit</translation>
     </message>
@@ -3215,6 +3962,171 @@ Standaardpoort 19455 wordt gebruikt.</translation>
         <comment>Password quality</comment>
         <translation>Uitstekend</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Geavanceerd</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation>.,:;</translation>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation>Quotes</translation>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation>&quot; &apos;</translation>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation>&lt;*+!? =</translation>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation>Streepjes</translation>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation>\_|-/</translation>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation>Logogrammen</translation>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation>Schakel over naar de simpele modus</translation>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation>Eenvoudig</translation>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation>Tekenset die niet gebruikt mag worden in het gegenereerde wachtwoord</translation>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation>Niet gebruiken:</translation>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation>Voeg niet-hex karakters toe aan de &quot;niet gebruiken&quot; lijst</translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation>Hex</translation>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation>Niet te gebruiken karakters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</translation>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation>Aantal woorden:</translation>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation>Regenereren</translation>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Verwijderen</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Verwijderen</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Uitschakelen</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3235,34 +4147,18 @@ Standaardpoort 19455 wordt gebruikt.</translation>
         <translation>Kan het bericht niet ontcijferen</translation>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
-        <translation>Timeout of geen verbinding met KeePassXC</translation>
-    </message>
-    <message>
         <source>Action cancelled or denied</source>
         <translation>Actie afgebroken of geweigerd</translation>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation>Kan bericht niet versleutelen of openbare sleutel niet gevonden. Is native messaging geactiveerd in KeePassXC?</translation>
-    </message>
-    <message>
         <source>KeePassXC association failed, try again</source>
         <translation>KeePassXC-koppeling is mislukt, probeer het opnieuw</translation>
     </message>
     <message>
-        <source>Key change was not successful</source>
-        <translation>Sleuteluitwisseling is mislukt</translation>
-    </message>
-    <message>
         <source>Encryption key is not recognized</source>
         <translation>De versleutelingssleutel is niet herkend</translation>
     </message>
     <message>
-        <source>No saved databases found</source>
-        <translation>Geen opgeslagen databases gevonden</translation>
-    </message>
-    <message>
         <source>Incorrect action</source>
         <translation>Onjuiste actie</translation>
     </message>
@@ -3336,7 +4232,7 @@ Standaardpoort 19455 wordt gebruikt.</translation>
     </message>
     <message>
         <source>Copy an entry&apos;s password to the clipboard.</source>
-        <translation>Gebruikerswachtwoord naar het klembord kopiëren.</translation>
+        <translation>Item&apos;s wachtwoord naar het klembord kopiëren.</translation>
     </message>
     <message>
         <source>Path of the entry to clip.</source>
@@ -3353,7 +4249,7 @@ Standaardpoort 19455 wordt gebruikt.</translation>
     </message>
     <message>
         <source>Title for the entry.</source>
-        <translation>Naam voor deze invoer.</translation>
+        <translation>Naam voor deze entry.</translation>
     </message>
     <message>
         <source>title</source>
@@ -3388,10 +4284,6 @@ Standaardpoort 19455 wordt gebruikt.</translation>
         <translation>Geef het wachtwoord voor %1:</translation>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation>Laden sleutelbestand mislukt %1: %2</translation>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3475,12 +4367,6 @@ Beschikbare opdrachten:
         <translation>fout bij het lezen van apparaat</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>leeg bestand!
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation>beschadigde tekst</translation>
     </message>
@@ -3489,30 +4375,6 @@ Beschikbare opdrachten:
         <translation>afsluitend aanhalingsteken ontbreekt</translation>
     </message>
     <message>
-        <source>AES: 256-bit</source>
-        <translation>AES: 256-bits</translation>
-    </message>
-    <message>
-        <source>Twofish: 256-bit</source>
-        <translation>Twofish: 256-bits</translation>
-    </message>
-    <message>
-        <source>ChaCha20: 256-bit</source>
-        <translation>ChaCha20: 256-bits</translation>
-    </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – aanbevolen)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 4)</source>
-        <translation>AES-KDF (KDBX 4)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 3.1)</source>
-        <translation>AES-KDF (KDBX 3.1)</translation>
-    </message>
-    <message>
         <source>Group</source>
         <translation>Groep</translation>
     </message>
@@ -3541,10 +4403,6 @@ Beschikbare opdrachten:
         <translation>Aangemaakt</translation>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
-        <translation>Verouderde browserintegratie</translation>
-    </message>
-    <message>
         <source>Browser Integration</source>
         <translation>Browserintegratie</translation>
     </message>
@@ -3573,10 +4431,6 @@ Beschikbare opdrachten:
         <translation>Aantal woorden voor de Diceware wachtwoordzin.</translation>
     </message>
     <message>
-        <source>count</source>
-        <translation>aantal</translation>
-    </message>
-    <message>
         <source>Wordlist for the diceware generator.
 [Default: EFF English]</source>
         <translation>Woordenlijst voor de Diceware-generator.
@@ -3587,28 +4441,440 @@ Beschikbare opdrachten:
         <translation>Genereer een willekeurig wachtwoord</translation>
     </message>
     <message>
-        <source>Length of the generated password.</source>
-        <translation>Lengte van het gegenereerde wachtwoord.</translation>
+        <source>Invalid value for password length %1.</source>
+        <translation>Ongeldige waarde voor wachtwoordlengte %1.</translation>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation>Kan geen item maken met pad %1.</translation>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation>Voer wachtwoord in voor nieuw item:</translation>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
-        <translation>Gebruik kleine letters in het gegenereerde wachtwoord</translation>
+        <source>Writing the database failed %1.</source>
+        <translation>Het schrijven van de database is mislukt %1.</translation>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
-        <translation>Gebruik hoofdletters in het gegenereerde wachtwoord</translation>
+        <source>Successfully added entry %1.</source>
+        <translation>Item %1 toegevoegd.</translation>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
-        <translation>Gebruik cijfers in het gegenereerde wachtwoord</translation>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation>Kopieer de huidige TOTP naar het klembord.</translation>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
-        <translation>Gebruik speciale karakters in het gegenereerde wachtwoord.</translation>
+        <source>Invalid timeout value %1.</source>
+        <translation>Ongeldige time-out waarde %1.</translation>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
-        <translation>Gebruik uitgebreide ASCII tekens in het gegenereerde wachtwoord.</translation>
+        <source>Entry %1 not found.</source>
+        <translation>Item %1 niet gevonden.</translation>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation>Item met pad %1 heeft geen TOTP instellingen.</translation>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation>De huidige TOTP naar het klembord gekopieerd!</translation>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation>Het wachtwoord is naar het klembord gekopieerd!</translation>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation><numerusform>Het klemboard wordt over %1 seconde(n) gewist...</numerusform><numerusform>Het klemboard wordt over %1 seconde(n) gewist...</numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation>Klembord gewist!</translation>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation>Verberg wachtwoord prompt en andere bijkomstige output.</translation>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation>aantal</translation>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation>Ongeldige waarde voor wachtwoordlengte %1.</translation>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation>Kan item met pad %1 niet vinden.</translation>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation>Geen enkel veld in item %1 is gewijzigd.</translation>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation>Voer nieuw wachtwoord in voor item:</translation>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation>Item %1 is gewijzigd.</translation>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation>Type: bruut geweld</translation>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation>Type: woordenboek</translation>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation>Type: woordenboek + Leet</translation>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation>Type: Gebruikerwoorden</translation>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation>Type: Gebruikerwoorden + Leet</translation>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation>Type: Herhaald</translation>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation>Type: Reeks</translation>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation>Type: Ruimtelijk</translation>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation>Type: Datum</translation>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation>Type: bruut geweld (Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation>Type: woordenboek (Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation>Type: woordenboek+Leet (Rep)</translation>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation>Type: Gebruikerwoorden (Rep)</translation>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation>Type: Gebruikerwoorden + Leet (Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation>Type: herhaald (Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation>Type: Reeks (Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation>Type: Ruimtelijk (Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation>Type: Datum (Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation>Type: Onbekend %1</translation>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation>Entropie %1 (2 %)</translation>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation>*** Wachtwoordlengte (%1) ! = som van de lengte van de onderdelen (%2) ***</translation>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation>Er ging iets fout bij het laden van sleutelbestand %1: %2</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>Bestand %1 bestaat niet.</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Kan bestand %1 niet openen.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation>Fout bij het lezen van de database:
+%1</translation>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation>Fout bij het ontleden van de database:
+%1</translation>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation>Lengte van het gegenereerde wachtwoord</translation>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation>Gebruik kleine letters</translation>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation>Gebruik hoofdletters</translation>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation>Getallen gebruiken.</translation>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation>Speciale tekens gebruiken</translation>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation>Uitgebreide ASCII tekens gebruikt</translation>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation>Op elkaar lijkende tekens niet gebruiken</translation>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation>Neem tekens uit iedere geslecteerde groep</translation>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation>Item %1 is hergebruikt.</translation>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation>Item %1 is verwijderd.</translation>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation>Toon de huidige TOTP van het item.</translation>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation>Geen programma ingesteld voor klembord manipulatie</translation>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation>Kon programma niet starten %1</translation>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation>leeg bestand</translation>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation>%1: (rij, col) 2%,3%</translation>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256-bits</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256-bits</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256-bits</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – aanbevolen)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation>Ongeldige instellingen</translation>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation>Ongeldige sleutel</translation>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>Een item uit de database verwijderen.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>Pad van het te verwijderen item.</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>Het bestaande single-instance vergrendelingsbestand is niet geldig. Een nieuwe instantie wordt gestart.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Het vergrendelingsbestand kon niet worden aangemaakt. Single-instance mode uitgeschakeld.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeepassXC - multi-platform wachtwoordbeheerder</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>bestandsnamen van de te openen wachtwoorddatabases (*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>pad naar een configuratiebestand</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>sleutelbestand van de database</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>lees wachtwoord van de database uit stdin</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation>Parent window handle</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Een andere instantie van KeePassXC is reeds gestart.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Fatale fout bij het testen van de cryptografische functies.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Fout</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation>Databasewachtwoord: </translation>
     </message>
 </context>
 <context>
@@ -3646,12 +4912,98 @@ Beschikbare opdrachten:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
+    <message>
+        <source>Agent connection failed.</source>
+        <translation>Agent verbinding mislukt.</translation>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation>Agent-protocolfout.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation>Geen agent wordt uitgevoerd, kan geen identiteit toevoegen.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation>Geen agent wordt uitgevoerd, niet het verwijderen van identiteit.</translation>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation>Agent weigerde deze identiteit. Mogelijke redenen zijn onder andere:</translation>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation>De sleutel was al toegevoegd.</translation>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation>Beperkte levensduur wordt niet ondersteund door de agent (selectievakje opties).</translation>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation>Een aanvraag voor transactiebevestiging wordt niet ondersteund door de agent (selectievakje opties).</translation>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation>Zoek hulp</translation>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation>Zoektermen zijn als volgt: [parameters][veld:][&quot;]term[&quot;]</translation>
+    </message>
     <message>
-        <source>Search...</source>
-        <translation>Zoeken…</translation>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation>Elke zoekterm moet overeenkomen (een logisch EN)</translation>
     </message>
     <message>
+        <source>Modifiers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation>zoekterm uit resultaten weglaten</translation>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation>zoekterm moet exact overeenkomen</translation>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation>regex gebruiken in zoekopdracht</translation>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation>Velden</translation>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation>Zoekterm jokertekens</translation>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation>elke overeenkomst</translation>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation>één overeenkomst</translation>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation>logische OF</translation>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation>Voorbeelden</translation>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
         <source>Search</source>
         <translation>Zoeken</translation>
     </message>
@@ -3660,314 +5012,316 @@ Beschikbare opdrachten:
         <translation>Wissen</translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Hoofdlettergevoelig</translation>
-    </message>
-    <message>
         <source>Limit search to selected group</source>
         <translation>Beperk het zoeken tot de geselecteerde groep</translation>
     </message>
+    <message>
+        <source>Search Help</source>
+        <translation>Zoek hulp</translation>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation>Zoeken (%1)...</translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation>Hoofdlettergevoelig</translation>
+    </message>
 </context>
 <context>
-    <name>Service</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC: Nieuw verzoek voor sleutelkoppeling</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation>Je hebt een koppelingsverzoek ontvangen voor bovenstaande sleutel.
-Als je de sleutel toegang tot jouw KeePassXC-database wil geven,
-geef het dan een unieke naam ter identificatie en accepteer het verzoek.</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: Bestaande sleutel overschrijven?</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Een gedeelde encryptiesleutel met de naam &quot;%1&quot; bestaat al.
-Wil je deze overschrijven?</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: Item bijwerken</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Wil je de gegevens in %1 - %2 bijwerken?</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Database vergrendeld!</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>De actieve database is vergrendeld!
-Ontgrendel de geselecteerde database of kies een ontgrendelde database.</translation>
+        <source>Key:</source>
+        <translation>Sleutel:</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Sleutels uit database verwijderd</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation><numerusform>Encryptie-sleutel verwijderd uit KeePassX/Http-instellingen.</numerusform><numerusform>%n encryptie-sleutels verwijderd uit KeePassX/Http-instellingen.</numerusform></translation>
+        <source>Generate</source>
+        <translation>Genereren</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Geen sleutels gevonden</translation>
+        <source>Import</source>
+        <translation>Importeren</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>Geen gedeelde encryptiesleutels gevonden in de KeePassHttp-instellingen.</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Instellingen niet beschikbaar!</translation>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>De actieve database bevat geen KeePassHttp-instellingen.</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>Opgeslagen permissies verwijderen…</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>Afbreken</translation>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Permissies verwijderd</translation>
+        <source>Remove</source>
+        <translation>Verwijderen</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation><numerusform>Permissies verwijderd uit %n item.</numerusform><numerusform>Permissies verwijderd uit %n items.</numerusform></translation>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Geen item met permissies gevonden!</translation>
+        <source>Status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>De actieve database bevat geen items met permissies.</translation>
+        <source>Fingerprint</source>
+        <translation>Vingerafdruk</translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
-        <translation>Programma-instellingen</translation>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Algemeen</translation>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>Beveiliging</translation>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>Geen toegang tot configuratiebestand %1</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>Basisinstellingen</translation>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Hoogstens een enkele instantie van KeePassXC starten</translation>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>Laatstgebruikte databases onthouden</translation>
+        <source>All files</source>
+        <translation>Alle bestanden</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Laatstgebruikte sleutelbestanden en beveiligingsdongles onthouden</translation>
+        <source>Select path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Laatstgebruikte databases openen bij het opstarten</translation>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>Automatisch opslaan bij afsluiten</translation>
+        <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"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>Automatisch opslaan na iedere wijziging</translation>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Database automatisch opnieuw laden als deze van buitenaf is gewijzigd</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>Minimaliseer bij kopiëren naar klembord</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Scherm minimaliseren bij het opstarten</translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>Gebruik groepsicoon voor nieuwe items</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Markeer de database niet als gewijzigd voor non-data wijzigingen (bijv. uitgebreide groepen)</translation>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
-        <translation>Detailweergave verbergen</translation>
+        <source>Never</source>
+        <translation>Nooit</translation>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>Icoon in het systeemvak tonen</translation>
+        <source>Always</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>Minimaliseren naar systeemvak</translation>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
-        <translation>Sluiten naar systeemvak in plaats van volledig afsluiten</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
-        <translation>Donker systeemvak-icoon</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Taal</translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Auto-type</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>Gebruik naam van item als vensternaam voor Auto-type</translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>Laat URL overeenkomen met item bij Auto-type</translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation>Altijd vragen voor toepassen Auto-type</translation>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Globale sneltoets voor Auto-type</translation>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>Auto-typevertraging</translation>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation>ms</translation>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
-        <translation>Opstarten</translation>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
-        <translation>Bestandsbeheer</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation>Veilig opslaan van databasebestanden (mogelijk incompatibel met Dropbox, etc.)</translation>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
-        <translation>Back-up databasebestand voor het opslaan</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
-        <translation>Itembeheer</translation>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Algemeen</translation>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
-        <translation>Time-outs</translation>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>Klembord leegmaken na</translation>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> sec</translation>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>Databases vergrendelen na inactiviteit van</translation>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Gemak</translation>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Databases vergrendelen als de gebruikerssessie wordt vergrendeld of bij het sluiten van de deksel</translation>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>Databases vergrendelen bij het minimaliseren van het venster</translation>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>TotpDialog</name>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>Geen herhaling van wachtwoord vragen als deze zichtbaar is</translation>
+        <source>Timed Password</source>
+        <translation>Tijdgebonden wachtwoord</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Wachtwoorden standaard weergeven</translation>
+        <source>000000</source>
+        <translation>000000</translation>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
-        <translation>Wachtwoorden verbergen in het informatiepaneel</translation>
+        <source>Copy</source>
+        <translation>Kopiëren</translation>
+    </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation><numerusform>Verloopt in &lt;b&gt;%n&lt;/b&gt; seconde(n)</numerusform><numerusform>Verloopt in &lt;b&gt;%n&lt;/b&gt; seconde(n)</numerusform></translation>
     </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
     <message>
-        <source>Hide entry notes by default</source>
-        <translation>Notities standaard verbergen</translation>
+        <source>Copy</source>
+        <translation>Kopiëren</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>Privacy</translation>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation>Let op: deze TOTP-instellingen zijn op maat en werken mogelijk niet met andere authenticators.</translation>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>Gebruik Google om eventueel website-iconen te downloaden</translation>
+        <source>There was an error creating the QR code.</source>
+        <translation>Er was een fout bij het maken van de QR-code.</translation>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
-        <translation>Vergrendelde database na Auto-type weer vergrendelen.</translation>
+        <source>Closing in %1 seconds.</source>
+        <translation>Sluiten in %1 seconden.</translation>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation>TOTP-instellen</translation>
@@ -3989,59 +5343,84 @@ Ontgrendel de geselecteerde database of kies een ontgrendelde database.</transla
         <translation>Aangepaste instellingen gebruiken</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>Let op: wijzig deze instellingen alleen als je weet wat je doet.</translation>
+        <source>Custom Settings</source>
+        <translation>Aangepaste instellingen</translation>
     </message>
     <message>
         <source>Time step:</source>
         <translation>Tijdsinterval:</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8 cijfers</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> sec</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>Grootte van de code:</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6 cijfers</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>Grootte van de code:</translation>
+        <source>7 digits</source>
+        <translation>7 cijfers</translation>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>sec</translation>
+        <source>8 digits</source>
+        <translation>8 cijfers</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>Tijdgebonden wachtwoord</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Kopiëren</translation>
+        <source>Close</source>
+        <translation>Sluiten</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>Verloopt over</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>seconden</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>Database ontgrendelen</translation>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4076,42 +5455,26 @@ Ontgrendel de geselecteerde database of kies een ontgrendelde database.</transla
     </message>
 </context>
 <context>
-    <name>main</name>
-    <message>
-        <source>Remove an entry from the database.</source>
-        <translation>Een item uit de database verwijderen.</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>Pad naar de database.</translation>
-    </message>
-    <message>
-        <source>Path of the entry to remove.</source>
-        <translation>Pad van het te verwijderen item.</translation>
-    </message>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeepassXC - multi-platform wachtwoordbeheerder</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>bestandsnamen van de te openen wachtwoorddatabases (*.kdbx)</translation>
+        <source>Refresh</source>
+        <translation>Vernieuwen</translation>
     </message>
     <message>
-        <source>path to a custom config file</source>
-        <translation>pad naar een configuratiebestand</translation>
+        <source>YubiKey Challenge-Response</source>
+        <translation>YubiKey challenge/response:</translation>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>sleutelbestand van de database</translation>
+        <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>&lt;p&gt;Als je zelf een &lt;a href=&quot;https://www.yubico.com/&quot;&gt; YubiKey&lt;/a&gt; hebt, kun je deze gebruiken voor extra beveiliging.&lt;/p&gt; &lt;p&gt;De YubiKey vereist dat een van zijn &quot;slots&quot; wordt geprogrammeerd als &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;</translation>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>lees wachtwoord van de database uit stdin</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation>Geen YubiKey gedetecteerd, plug deze aub in.</translation>
     </message>
     <message>
-        <source>Parent window handle</source>
-        <translation>Parent window handle</translation>
+        <source>No YubiKey inserted.</source>
+        <translation>Geen YubiKey ingeplugd.</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_pl.ts b/share/translations/keepassx_pl.ts
index d50418675..c79964098 100644
--- a/share/translations/keepassx_pl.ts
+++ b/share/translations/keepassx_pl.ts
@@ -38,12 +38,6 @@
         <translation>Skopiuj do schowka</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>Wersja %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>Rewizja: %1</translation>
     </message>
@@ -76,35 +70,48 @@ Jądro: %3 %4</translation>
         <translation>Specjalne podziękowania od zespołu KeePassXC dla debfx za stworzenie oryginalnego KeePassX.</translation>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
-        <translation>Typ kompilacji: %1
-</translation>
+        <source>Version %1</source>
+        <translation>Wersja %1</translation>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>Potwierdź dostęp KeePassXC HTTP</translation>
+        <source>Build Type: %1</source>
+        <translation>Typ kompilacji: %1</translation>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>Zapamiętaj tę decyzję</translation>
+        <source>Auto-Type</source>
+        <translation>Autouzupełnianie</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Zezwól</translation>
+        <source>Browser Integration</source>
+        <translation>Integracja z przeglądarką</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>Odmów</translation>
+        <source>SSH Agent</source>
+        <translation>Agent SSH</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>%1 zażądał dostępu do haseł dla następujących element(ów).
-Wybierz, czy chcesz zezwolić na dostęp.</translation>
+        <source>YubiKey</source>
+        <translation>YubiKey</translation>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation>TouchID</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Żaden</translation>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -113,6 +120,278 @@ Wybierz, czy chcesz zezwolić na dostęp.</translation>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>Włącz agenta SSH (wymaga ponownego uruchomienia)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Ustawienia aplikacji</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Ogólne</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Bezpieczeństwo</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Błąd dostępu pliku konfiguracyjnego %1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Ustawienia podstawowe</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>Uruchamianie</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Uruchom tylko jedną instancję KeePassXC</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Pamiętaj ostatnią bazę danych</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Zapamiętaj ostatnie pliki klucze i klucze sprzętowe</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Załaduj poprzednie bazy danych podczas uruchomienia</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>Minimalizuj okno podczas uruchomienia aplikacji</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>Zarządzanie plikami</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation>Bezpiecznie zapisuj pliki bazy danych (może być niezgodne z Dropbox itp.)</translation>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation>Utwórz kopię zapasową pliku bazy danych przed zapisaniem</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Automatycznie zapisz po każdej zmianie</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Automatycznie zapisz przy wyjściu</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Nie zaznaczaj bazy danych jako zmodyfikowanej dla zmian innych niż dane (np. rozwijanie grup)</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Automatycznie przeładuj bazę danych, gdy zostanie zmodyfikowana zewnętrznie</translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>Zarządzanie wpisami</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>Użyj ikony grupy podczas tworzenia wpisu</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Zminimalizuj po skopiowaniu do schowka</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation>Ukryj panel podglądu wpisu</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Ogólne</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation>Ukryj pasek narzędzi (ikony)</translation>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation>Zminimalizuj zamiast wyjść z aplikacji</translation>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Pokaż ikonę w zasobniku systemowym</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>Ciemna ikona w zasobniku systemowym</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Schowaj okno do zasobnika podczas minimalizacji</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Język</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Autouzupełnianie</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>Użyj tytułu wpisy, aby dopasować okna dla globalnego auto-uzupełniania</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>Użyj adresu URL wpisy, aby dopasować okna dla globalnego auto-uzupełniania</translation>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>Zawsze pytaj przed wykonaniem auto-uzupełninia</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Globalny skrót auto-uzupełnianie</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation>Opóźnienie pisania auto-uzupełniania</translation>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation> ms</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation>Opóźnienie rozpoczęcia auto-uzupełniania</translation>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>Limity czasowe</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>Wyczyść schowek po</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> s</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>Zablokuj bazę danych po nieaktywności</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation> min</translation>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation>Zapomnij TouchID po nieaktywności</translation>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>Poręczność</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Zablokuj bazy danych, gdy sesja jest zablokowana albo pokrywa jest zamknięta</translation>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation>Zapomnij TouchID, gdy sesja jest zablokowana lub pokrywa jest zamknięta</translation>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>Zablokuj bazę danych po zminimalizowaniu okna</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation>Ponownie zablokuj poprzednio zablokowaną bazę danych po wykonaniu auto-uzupełninia
+</translation>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>Nie wymagaj powtarzania hasła, gdy jest widoczne</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation>Nie ukrywaj haseł podczas ich edycji</translation>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation>Nie używaj symboli zastępczych w pustych polach hasła</translation>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation>Ukryj hasła w panelu podglądu wpisu</translation>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>Domyślnie ukrywaj wpisy notatek</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>Prywatność</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation>Użyj DuckDuckGo jako zastępstwo dla pobierania ikon witryn</translation>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -216,6 +495,27 @@ Wybierz, czy chcesz zezwolić na dostęp.</translation>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation>Zapisz wpis KeePassXC-Browser</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Anuluj</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation>Masz wiele otwartych baz danych.
+Wybierz właściwą bazę danych do zapisania danych uwierzytelniających.</translation>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -289,14 +589,6 @@ Wybierz, czy chcesz zezwolić na dostęp.</translation>
         <translation>Sortuj dopasowane poświadczenia według &amp;użytkownika</translation>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>&amp;Odłącz wszystkie przeglądarki</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>Zapomnij wszystkie zapamiętane &amp;uprawnienia</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>Zaawansowane</translation>
     </message>
@@ -362,14 +654,6 @@ Wybierz, czy chcesz zezwolić na dostęp.</translation>
         <translation>&lt;b&gt;Ostrzeżenie:&lt;/b&gt; Poniższe opcje mogą być niebezpieczne!</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>Pliki wykonywalne (*.exe);;Wszystkie pliki (*.*)</translation>
-    </message>
-    <message>
-        <source>Executable Files (*)</source>
-        <translation>Pliki wykonywalne (*)</translation>
-    </message>
-    <message>
         <source>Select custom proxy location</source>
         <translation>Wybierz niestandardową lokalizację proxy</translation>
     </message>
@@ -377,6 +661,31 @@ Wybierz, czy chcesz zezwolić na dostęp.</translation>
         <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
         <translation>Przykro nam, ale KeePassXC-Browser obecnie nie obsługuje wydań Snap.</translation>
     </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation>KeePassXC-Browser jest potrzebny, aby działała integracja z przeglądarką. &lt;br /&gt;Pobierz go dla %1 oraz %2.</translation>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation>&amp;Tor Browser</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: </source>
+        <translation>&lt;b&gt;Ostrzeżenie&lt;/b&gt;, aplikacja keepassxc-proxy nie została znaleziona!&lt;br /&gt;Proszę sprawdzić katalog instalacyjny KeePassXC albo potwierdzić niestandardową ścieżkę w opcjach zaawansowanych.&lt;br /&gt;Integracja z przeglądarką NIE BĘDZIE DZIAŁAĆ bez aplikacji proxy.&lt;br /&gt;Oczekiwana ścieżka: </translation>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation>Pliki wykonywalne</translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation>Wszystkie pliki</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"/>
+    </message>
 </context>
 <context>
     <name>BrowserService</name>
@@ -417,153 +726,46 @@ Czy chcesz go nadpisać?</translation>
         <translation>Czy chcesz uaktualnić informację w %1 - %2?</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Baza danych zablokowana!</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Aktywna baza danych jest zablokowana!
-Proszę odblokować wybraną bazę albo wybrać inną, która jest odblokowana.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Ustawienia niedostępne!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation>Aktywna baza danych nie zawiera wpisu z ustawieniami.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Nie znaleziono kluczy</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation>Nie znaleziono współdzielonych kluczy szyfrujących w ustawieniach KeePassXC.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Usunięto klucze z bazy danych</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation><numerusform>Pomyślnie usunięto %n klucz szyfrowania z ustawień KeePassXC.</numerusform><numerusform>Pomyślnie usunięto %n klucze szyfrowania z ustawień KeePassXC.</numerusform><numerusform>Pomyślnie usunięto %n kluczy szyfrowania z ustawień KeePassXC.</numerusform><numerusform>Pomyślnie usunięto %n kluczy szyfrowania z ustawień KeePassXC.</numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>Usuwanie przechowywanych uprawnień...</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>Zaniechaj</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Usunięto uprawnienia</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation><numerusform>Pomyślnie usunięto uprawnienia z %n wpisu.</numerusform><numerusform>Pomyślnie usunięto uprawnienia z %n wpisów.</numerusform><numerusform>Pomyślnie usunięto uprawnienia z %n wpisów.</numerusform><numerusform>Pomyślnie usunięto uprawnienia z %n wpisu(ów).</numerusform></translation>
+        <source>Converting attributes to custom data…</source>
+        <translation>Konwertowanie atrybutów na niestandardowe dane...</translation>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Nie znaleziono wpisu z uprawnieniami!</translation>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation>KeePassXC: Przekonwertowane atrybuty KeePassHTTP</translation>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Aktywna baza danych nie zawiera wpisu z uprawnieniami.</translation>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation>Pomyślnie przekonwertowano atrybuty z %1 wpis(ów).
+Przeniesiono %2 klucze do niestandardowych danych.</translation>
     </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>Hasło</translation>
-    </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>Wprowadź hasło:</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>Wprowadź ponownie hasło:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;Plik klucza</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>Przeglądaj</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Stwórz</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>&amp;Wyzwanie-odpowiedź</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Odśwież</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>Pliki kluczy</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>Wszystkie pliki</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>Utwórz plik klucza...</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>Nie można utworzyć pliku klucza : </translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>Wybierz plik klucza</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Puste hasło</translation>
-    </message>
-    <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>Czy na pewno chcesz używać pustego ciągu jako hasła?</translation>
-    </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>Podano różne hasła.</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation><numerusform>Pomyślnie przeniesiono %n klucz do niestandardowych danych.</numerusform><numerusform>Pomyślnie przeniesiono %n klucze do niestandardowych danych.</numerusform><numerusform>Pomyślnie przeniesiono %n kluczy do niestandardowych danych.</numerusform><numerusform>Pomyślnie przeniesiono %n kluczy do niestandardowych danych.</numerusform></translation>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>Błąd w ustawieniu %1 jako plik klucza:
-%2</translation>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation>KeePassXC: Nie znaleziono wpisu z atrybutami KeePassHTTP!</translation>
     </message>
     <message>
-        <source>Legacy key file format</source>
-        <translation>Przestarzały format pliku klucza</translation>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation>Aktywna baza danych nie zawiera wpisu z atrybutami KeePassHTTP.</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>Używasz przestarzałego formatu pliku klucza, który może nie być
-obsługiwany w przyszłości.
-
-Proszę rozważyć wygenerowanie nowego pliku klucza.</translation>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation>KeePassXC: Wykryto ustawienia przestarzałej integracji z przeglądarką</translation>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>Zmiana klucza głównego nie powiodła się: nie włożono YubiKey.</translation>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation>Wykryto ustawienia przestarzałej integracji z przeglądarką.
+Czy chcesz uaktualnić ustawienia do najnowszego standardu?
+Jest to konieczne, aby zachować zgodność z wtyczką przeglądarki.</translation>
     </message>
 </context>
 <context>
@@ -644,14 +846,6 @@ Proszę rozważyć wygenerowanie nowego pliku klucza.</translation>
         <translation>Nie występuje w pliku CSV</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>Pusty tytuł pola</translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>kolumna </translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>Importowane z pliku CSV</translation>
     </message>
@@ -660,48 +854,85 @@ Proszę rozważyć wygenerowanie nowego pliku klucza.</translation>
         <translation>Oryginalne dane: </translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>Wykryto błąd(błędy) w pliku CSV !</translation>
+        <source>Error</source>
+        <translation>Błąd</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation> więcej komunikatów pominięto]</translation>
+        <source>Empty fieldname %1</source>
+        <translation>Pusta nazwa pola %1</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Błąd</translation>
+        <source>column %1</source>
+        <translation>kolumna %1</translation>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>Import CSV: zapisywanie z błędami:
-</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation>Wykryto błąd lub błędy w pliku CSV!</translation>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>Błąd</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation><numerusform> [%n więcej komunikat pominięto]</numerusform><numerusform> [%n więcej komunikatów pominięto]</numerusform><numerusform> [%n więcej komunikatów pominięto]</numerusform><numerusform> [%n więcej komunikatów pominięto]</numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Nie mogę wyliczyć głównego klucza</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation>Import CSV: zapisywanie z błędami:
+%1</translation>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
-        <translation><numerusform>%n bajt, </numerusform><numerusform>%n bajty, </numerusform><numerusform>%n bajtów, </numerusform><numerusform>%n bajtów, </numerusform></translation>
+        <source>%n column(s)</source>
+        <translation><numerusform>%n kolumna</numerusform><numerusform>%n kolumny</numerusform><numerusform>%n kolumn</numerusform><numerusform>%n kolumn</numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation>%1, %2, %3</translation>
     </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
-        <translation><numerusform>%n rząd, </numerusform><numerusform>%n rzędy, </numerusform><numerusform>%n rzędów, </numerusform><numerusform>%n rzędów, </numerusform></translation>
+        <source>%n byte(s)</source>
+        <translation><numerusform>%n bajt</numerusform><numerusform>%n bajty</numerusform><numerusform>%n bajtów</numerusform><numerusform>%n bajtów</numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
-        <translation><numerusform>%n kolumna</numerusform><numerusform>%n kolumny</numerusform><numerusform>%n kolumn</numerusform><numerusform>%n kolumn</numerusform></translation>
+        <source>%n row(s)</source>
+        <translation><numerusform>%n rząd</numerusform><numerusform>%n rzędy</numerusform><numerusform>%n rzędów</numerusform><numerusform>%n rzędów</numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Główna</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>Plik %1 nie istnieje.</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Nie można otworzyć pliku %1.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation>Błąd podczas odczytu bazy danych: %1</translation>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation>Nie można zapisać, baza danych nie ma nazwy pliku.</translation>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation>Plik nie może zostać zapisany, ponieważ jest otwarty w trybie tylko do odczytu.</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation>Odblokuj bazę danych - KeePassXC</translation>
     </message>
 </context>
 <context>
@@ -731,14 +962,6 @@ Proszę rozważyć wygenerowanie nowego pliku klucza.</translation>
         <translation>Wyzwanie-odpowiedź:</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Nie można otworzyć bazy danych.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Nie można otworzyć pliku klucza</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation>Przestarzały format pliku klucza</translation>
     </message>
@@ -768,53 +991,254 @@ Proszę rozważyć wygenerowanie nowego pliku klucza.</translation>
         <source>Select key file</source>
         <translation>Wybierz plik klucza</translation>
     </message>
+    <message>
+        <source>TouchID for quick unlock</source>
+        <translation>TouchID do szybkiego odblokowania</translation>
+    </message>
+    <message>
+        <source>Unable to open the database:
+%1</source>
+        <translation>Nie można otworzyć bazy danych:
+%1</translation>
+    </message>
+    <message>
+        <source>Can't open key file:
+%1</source>
+        <translation>Nie można otworzyć pliku klucza:
+%1</translation>
+    </message>
 </context>
 <context>
-    <name>DatabaseRepairWidget</name>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Repair database</source>
-        <translation>Napraw bazę danych</translation>
+        <source>Passwords</source>
+        <translation>Hasła</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
     <message>
-        <source>Error</source>
-        <translation>Błąd</translation>
+        <source>Advanced Settings</source>
+        <translation>Ustawienia zaawansowane</translation>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Nie mogę otworzyć pliku klucza</translation>
+        <source>General</source>
+        <translation>Ogólne</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Nie można otworzyć bazy danych.</translation>
+        <source>Security</source>
+        <translation>Bezpieczeństwo</translation>
+    </message>
+    <message>
+        <source>Master Key</source>
+        <translation>Klucz główny</translation>
+    </message>
+    <message>
+        <source>Encryption Settings</source>
+        <translation>Ustawienia szyfrowania</translation>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation>Integracja z przeglądarką</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetBrowser</name>
+    <message>
+        <source>KeePassXC-Browser settings</source>
+        <translation>Ustawienia KeePassXC-Browser</translation>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>&amp;Odłącz wszystkie przeglądarki</translation>
+    </message>
+    <message>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation>Za&amp;pomnij wszystkie ustawienia witryn dla wpisów</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation>Przenieś atrybuty KeePassHTTP do &amp;niestandardowych danych KeePassXC-Browser</translation>
+    </message>
+    <message>
+        <source>Stored keys</source>
+        <translation>Przechowywane klucze</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Usuń</translation>
+    </message>
+    <message>
+        <source>Delete the selected key?</source>
+        <translation>Usunąć wybrany klucz?</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation>Czy na pewno chcesz usunąć wybrany klucz?
+Może to uniemożliwić połączenie z wtyczką przeglądarki.</translation>
+    </message>
+    <message>
+        <source>Key</source>
+        <translation>Klucz</translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation>Wartość</translation>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation>Włącz integrację z przeglądarką, aby uzyskać dostęp do tych ustawień.</translation>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation>Odłącz wszystkie przeglądarki</translation>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation>Czy na pewno chcesz odłączyć wszystkie przeglądarki?
+Może to uniemożliwić połączenie z wtyczką przeglądarki.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Nie znaleziono kluczy</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation>Nie znaleziono współdzielonych kluczy szyfrujących w ustawieniach KeePassXC.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Usunięto klucze z bazy danych</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation><numerusform>Pomyślnie usunięto %n klucz szyfrowania z ustawień KeePassXC.</numerusform><numerusform>Pomyślnie usunięto %n klucze szyfrowania z ustawień KeePassXC.</numerusform><numerusform>Pomyślnie usunięto %n kluczy szyfrowania z ustawień KeePassXC.</numerusform><numerusform>Pomyślnie usunięto %n kluczy szyfrowania z ustawień KeePassXC.</numerusform></translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Pomyślnie otworzono bazę danych. Nic do zrobienia.</translation>
+        <source>Forget all site-specific settings on entries</source>
+        <translation>Zapomnij wszystkie ustawienia witryn dla wpisów</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>Sukces</translation>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation>Czy na pewno chcesz zapomnieć wszystkie ustawienia witryn dla każdego wpisu?
+Uprawnienia dostępu do wpisów zostaną odwołane.</translation>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>Baza danych została naprawiona
-Możesz ją teraz zapisać.</translation>
+        <source>Removing stored permissions…</source>
+        <translation>Usuwanie przechowywanych uprawnień...</translation>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>Nie udało się naprawić bazy danych.</translation>
+        <source>Abort</source>
+        <translation>Zaniechaj</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Usunięto uprawnienia</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation><numerusform>Pomyślnie usunięto uprawnienia z %n wpisu.</numerusform><numerusform>Pomyślnie usunięto uprawnienia z %n wpisów.</numerusform><numerusform>Pomyślnie usunięto uprawnienia z %n wpisów.</numerusform><numerusform>Pomyślnie usunięto uprawnienia z %n wpisów.</numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: Nie znaleziono wpisu z uprawnieniami!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Aktywna baza danych nie zawiera wpisu z uprawnieniami.</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation>Przenieś atrybuty KeePassHTTP do niestandardowych danych</translation>
+    </message>
+    <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>Czy na pewno chcesz przenieść wszystkie dane przestarzałej integracji z przeglądarką do najnowszego standardu?
+Jest to konieczne, aby zachować zgodność z wtyczką przeglądarki.</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetEncryption</name>
     <message>
-        <source>General</source>
-        <translation>Ogólne</translation>
+        <source>Encryption Algorithm:</source>
+        <translation>Algorytm szyfrowania:</translation>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>Szyfrowanie</translation>
+        <source>AES:  256 Bit   (default)</source>
+        <translation>AES:  256-bitowy   (domyślny)</translation>
+    </message>
+    <message>
+        <source>Twofish:  256 Bit</source>
+        <translation>Twofish:  256-bitowy</translation>
+    </message>
+    <message>
+        <source>Key Derivation Function:</source>
+        <translation>Funkcja derywacji klucza:</translation>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation>Liczba rund szyfrowania:</translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation>Przetestuj 1-sekundowe opóźnienie</translation>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation>Zużycie pamięci:</translation>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation>Paralelizm:</translation>
+    </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation>Czas odszyfrowania:</translation>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation>?? s</translation>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation>Zmień</translation>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation>100 ms</translation>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation>5 s</translation>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation>Wyższe wartości zapewniają lepszą ochronę, ale otwarcie bazy danych potrwa dłużej.</translation>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation>Format bazy danych:</translation>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation>Jest to ważne tylko wtedy, gdy musisz korzystać z bazy danych z innymi programami.</translation>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation>KDBX 4.0 (zalecany)</translation>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation>KDBX 3.1</translation>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation>niezmieniony</translation>
     </message>
     <message>
         <source>Number of rounds too high</source>
@@ -868,40 +1292,15 @@ Jeśli zachowasz tę liczbę, twoja baza danych może być zbyt łatwa do złama
         <comment>Threads for parallel execution (KDF settings)</comment>
         <translation><numerusform> wątek</numerusform><numerusform> wątki</numerusform><numerusform> wątków</numerusform><numerusform> wątków</numerusform></translation>
     </message>
-</context>
-<context>
-    <name>DatabaseSettingsWidgetEncryption</name>
-    <message>
-        <source>Encryption Algorithm:</source>
-        <translation>Algorytm szyfrowania:</translation>
-    </message>
-    <message>
-        <source>AES:  256 Bit   (default)</source>
-        <translation>AES:  256-bitowy   (domyślny)</translation>
-    </message>
-    <message>
-        <source>Twofish:  256 Bit</source>
-        <translation>Twofish:  256-bitowy</translation>
-    </message>
-    <message>
-        <source>Key Derivation Function:</source>
-        <translation>Funkcja derywacji klucza:</translation>
-    </message>
-    <message>
-        <source>Transform rounds:</source>
-        <translation>Liczba rund szyfrowania:</translation>
-    </message>
-    <message>
-        <source>Benchmark 1-second delay</source>
-        <translation>Przetestuj 1-sekundowe opóźnienie</translation>
-    </message>
-    <message>
-        <source>Memory Usage:</source>
-        <translation>Zużycie pamięci:</translation>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation><numerusform>%1 ms</numerusform><numerusform>%1 ms</numerusform><numerusform>%1 ms</numerusform><numerusform>%1 ms</numerusform></translation>
     </message>
-    <message>
-        <source>Parallelism:</source>
-        <translation>Paralelizm:</translation>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform></translation>
     </message>
 </context>
 <context>
@@ -952,91 +1351,112 @@ Jeśli zachowasz tę liczbę, twoja baza danych może być zbyt łatwa do złama
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>Główna</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Baza danych KeePass 2</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Wszystkie pliki</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Otwórz bazę danych</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>Nie znaleziono pliku!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Nie można otworzyć bazy danych.</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>Plik otwarty w trybie tylko do odczytu.</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>Otwórz plik CSV</translation>
+        <source>Add additional protection...</source>
+        <translation>Dodaj dodatkową ochronę...</translation>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>plik CSV</translation>
+        <source>No encryption key added</source>
+        <translation>Nie dodano klucza szyfrowania</translation>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>Wszystkie pliki (*)</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation>Musisz dodać co najmniej jeden klucz szyfrowania, aby zabezpieczyć bazę danych.</translation>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Połącz bazy danych</translation>
+        <source>No password set</source>
+        <translation>Brak hasła</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Otwórz bazę danych KeePass 1</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>OSTRZEŻENIE! Nie ustawiłeś hasła. Używanie bazy danych bez hasła jest zdecydowanie odradzane!
+
+Czy na pewno chcesz kontynuować bez hasła?</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>Baza danych KeePass 1</translation>
+        <source>Unknown error</source>
+        <translation>Nieznany błąd</translation>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>Zamknąć?</translation>
+        <source>Failed to change master key</source>
+        <translation>Nie udało się zmienić klucza głównego</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; jest w trybie edytowania.
-Odrzucić zmiany i zamknąć?</translation>
+        <source>Database Name:</source>
+        <translation>Nazwa bazy danych:</translation>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>Zapisać zmiany?</translation>
+        <source>Description:</source>
+        <translation>Opis:</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>&quot;%1&quot; został zmieniony.
-Zapisać zmiany?</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Baza danych KeePass 2</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Błąd przy zapisie bazy danych.</translation>
+        <source>All files</source>
+        <translation>Wszystkie pliki</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Hasła</translation>
+        <source>Open database</source>
+        <translation>Otwórz bazę danych</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Zapisz bazę danych jako</translation>
+        <source>CSV file</source>
+        <translation>plik CSV</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>Scal bazę danych</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Otwórz bazę danych KeePass 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>Baza danych KeePass 1</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1047,40 +1467,41 @@ Zapisać zmiany?</translation>
         <translation>Błąd przy zapisywaniu pliku CSV.</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>Nowa baza danych</translation>
+        <source>Database creation error</source>
+        <translation>Błąd tworzenia bazy danych</translation>
     </message>
     <message>
-        <source>locked</source>
-        <translation>zablokowana</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>Utworzona baza danych nie ma klucza ani KDF, odmawiam jej zapisania.
+Jest to z pewnością błąd, zgłoś go programistom.</translation>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>Zablokuj bazę danych</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation>Plik bazy danych nie istnieje lub nie jest dostępny.</translation>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>Nie można zablokować bazy danych, którą edytujesz.
-Naciśnij anuluj, aby zakończyć zmiany albo porzucić je.</translation>
+        <source>Select CSV file</source>
+        <translation>Wybierz plik CSV</translation>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>Baza danych została zmodyfikowana.
-Czy chcesz zapisać zmiany przed zablokowaniem?
-W przeciwnym wypadku zmiany zostaną porzucone.</translation>
+        <source>New Database</source>
+        <translation>Nowa baza danych</translation>
     </message>
     <message>
-        <source>Disable safe saves?</source>
-        <translation>Wyłączyć bezpieczne zapisywanie?</translation>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Nowa baza danych]</translation>
     </message>
     <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 nie zdołał wielokrotnie zapisać bazy danych. Jest to prawdopodobnie spowodowane przez usługi synchronizacji plików, które blokują plik zapisu.
-Wyłączyć bezpieczne zapisywanie i spróbować ponownie?</translation>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Zablokowana]</translation>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Tylko do odczytu]</translation>
     </message>
 </context>
 <context>
@@ -1090,37 +1511,13 @@ Wyłączyć bezpieczne zapisywanie i spróbować ponownie?</translation>
         <translation>Wyszukiwanie...</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>Zmień główne hasło</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>Skasować wpis?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>Czy na pewno całkowicie usunąć wpis &quot;%1&quot; ?</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Usunąć wpisy?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Czy na prawdę chcesz usunąć %1 wpisów na dobre?</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Przenieść wpis do kosza?</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation>Czy na pewno chcesz przenieść wpis&quot; %1&quot; do kosza?</translation>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Przenieść wpisy do kosza?</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation><numerusform>Czy na pewno chcesz przenieść %n wpis do kosza?</numerusform><numerusform>Czy na pewno chcesz przenieść %n wpisy do kosza?</numerusform><numerusform>Czy na pewno chcesz przenieść %n wpisów do kosza?</numerusform><numerusform>Czy na pewno chcesz przenieść %n wpisów do kosza?</numerusform></translation>
@@ -1138,18 +1535,10 @@ Wyłączyć bezpieczne zapisywanie i spróbować ponownie?</translation>
         <translation>Zapamiętaj mój wybór</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Usunąć grupę?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>Czy na pewno całkowicie usunąć grupę &quot;%1&quot;?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Nie mogę wyliczyć głównego klucza</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>Brak bieżącej bazy danych.</translation>
     </message>
@@ -1175,17 +1564,13 @@ Wyłączyć bezpieczne zapisywanie i spróbować ponownie?</translation>
     </message>
     <message>
         <source>Merge Request</source>
-        <translation>Połącz żądanie</translation>
+        <translation>Żądanie scalenia</translation>
     </message>
     <message>
         <source>The database file has changed and you have unsaved changes.
 Do you want to merge your changes?</source>
         <translation>Plik bazy danych został zmieniony, a masz niezapisane zmiany.
-Czy chcesz połączyć twoje zmiany?</translation>
-    </message>
-    <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>Nie można otworzyć nowego pliku bazy danych podczas próby automatycznego przeładowania tej bazy.</translation>
+Czy chcesz scalić twoje zmiany?</translation>
     </message>
     <message>
         <source>Empty recycle bin?</source>
@@ -1195,88 +1580,107 @@ Czy chcesz połączyć twoje zmiany?</translation>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>Czy na pewno chcesz nieodwracalnie usunąć wszystko z twojego kosza?</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>Wygeneruj token TOTP</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation><numerusform>Czy naprawdę chcesz usunąć %n wpis na dobre?</numerusform><numerusform>Czy naprawdę chcesz usunąć %n wpisy na dobre?</numerusform><numerusform>Czy naprawdę chcesz usunąć %n wpisów na dobre?</numerusform><numerusform>Czy naprawdę chcesz usunąć %n wpisów na dobre?</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation><numerusform>Usunąć wpis?</numerusform><numerusform>Usunąć wpisy?</numerusform><numerusform>Usunąć wpisy?</numerusform><numerusform>Usunąć wpisy?</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation><numerusform>Przenieść wpis do kosza?</numerusform><numerusform>Przenieść wpisy do kosza?</numerusform><numerusform>Przenieść wpisy do kosza?</numerusform><numerusform>Przenieść wpisy do kosza?</numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Zamknij</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Plik otwarty w trybie tylko do odczytu.</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Ogólne</translation>
+        <source>Lock Database?</source>
+        <translation>Zablokować bazę danych?</translation>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Hasło</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation>Edytujesz wpis. Odrzucić zmiany i mimo to zablokować?</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot; został zmieniony.
+Zapisać zmiany?</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>Wygaśnięcie</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation>Baza danych została zmodyfikowana.
+Zapisać zmiany?</translation>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Użytkownik</translation>
+        <source>Save changes?</source>
+        <translation>Zapisać zmiany?</translation>
     </message>
     <message>
-        <source>Autotype</source>
-        <translation>Autouzupełnianie</translation>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation>Nie można otworzyć nowego pliku bazy danych podczas próby automatycznego przeładowania.
+Błąd: %1</translation>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>Wyszukiwanie</translation>
+        <source>Disable safe saves?</source>
+        <translation>Wyłączyć bezpieczne zapisywanie?</translation>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>Atrybuty</translation>
+        <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 nie zdołał wielokrotnie zapisać bazy danych. Jest to prawdopodobnie spowodowane przez usługi synchronizacji plików, które blokują plik zapisu.
+Wyłączyć bezpieczne zapisywanie i spróbować ponownie?</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Załączniki</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation>Błąd zapisu bazy danych.
+%1</translation>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Notatki</translation>
+        <source>Passwords</source>
+        <translation>Hasła</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>Okno</translation>
+        <source>Save database as</source>
+        <translation>Zapisz bazę danych jako</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>Sekwencja</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Baza danych KeePass 2</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Szukaj</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Wyczyść</translation>
+        <source>Delete group</source>
+        <translation>Usuń grupę</translation>
     </message>
     <message>
-        <source>Never</source>
-        <translation>Nigdy</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[CHRONIONE]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>Wyłączone</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Włączone</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1350,22 +1754,10 @@ Czy chcesz połączyć twoje zmiany?</translation>
         <translation>Nowy atrybut</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Potwierdź usunięcie</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>Czy na pewno chcesz usunąć ten atrybut?</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[CHRONIONE]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation>Wciśnij Odsłoń, aby obejrzeć lub edytować</translation>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>Jutro</translation>
     </message>
@@ -1378,10 +1770,6 @@ Czy chcesz połączyć twoje zmiany?</translation>
         <translation><numerusform>%n miesiąc</numerusform><numerusform>%n miesiące</numerusform><numerusform>%n miesięcy</numerusform><numerusform>%n miesięcy</numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 rok</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation>Zastosować wygenerowane hasło?</translation>
     </message>
@@ -1393,6 +1781,26 @@ Czy chcesz połączyć twoje zmiany?</translation>
         <source>Entry updated successfully.</source>
         <translation>Wpis został pomyślnie zaktualizowany.</translation>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation>Wpis ma niezapisane zmiany</translation>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation>Nowy atrybut %1</translation>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation>[CHRONIONE] Wciśnij Odsłoń, aby zobaczyć albo edytować</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n rok</numerusform><numerusform>%n lata</numerusform><numerusform>%n lat</numerusform><numerusform>%n lat</numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1638,6 +2046,81 @@ Czy chcesz połączyć twoje zmiany?</translation>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>Formularz</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Hasło:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1695,10 +2178,6 @@ Czy chcesz połączyć twoje zmiany?</translation>
         <translation>Nie można pobrać ikony ulubionych.</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Wskazówka: możesz włączyć Google jako zastępstwo w menu Narzędzia&gt;Ustawienia&gt;Bezpieczeństwo</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>Obrazy</translation>
     </message>
@@ -1707,14 +2186,6 @@ Czy chcesz połączyć twoje zmiany?</translation>
         <translation>Wszystkie pliki</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Wybierz obraz</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read icon</source>
-        <translation>Nie można odczytać ikony</translation>
-    </message>
-    <message>
         <source>Custom icon already exists</source>
         <translation>Ikona niestandardowa już istnieje</translation>
     </message>
@@ -1723,8 +2194,36 @@ Czy chcesz połączyć twoje zmiany?</translation>
         <translation>Potwierdź usunięcie</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>Ta ikona używana jest przez %1 wpisów i zostanie zamieniona na ikonę domyślną. Czy na pewno chcesz ją usunąć?</translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation>Ikona niestandardowa została pomyślnie pobrana</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>Podpowiedź: Możesz włączyć DuckDuckGo jako zastępstwo w menu Narzędzia&gt;Ustawienia&gt;Bezpieczeństwo</translation>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation>Wybierz obraz(y)</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation><numerusform>Pomyślnie załadowano %1 z %n ikony</numerusform><numerusform>Pomyślnie załadowano %1 z %n ikon</numerusform><numerusform>Pomyślnie załadowano %1 z %n ikon</numerusform><numerusform>Pomyślnie załadowano %1 z %n ikon</numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation>Żadne ikony nie zostały załadowane</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation><numerusform>%n ikona już istnieje w bazie danych</numerusform><numerusform>%n ikony już istnieją w bazie danych</numerusform><numerusform>%n ikon już istnieje w bazie danych</numerusform><numerusform>%n ikon już istnieje w bazie danych</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation><numerusform>Niepowodzenie następującej ikony:</numerusform><numerusform>Niepowodzenie następujących ikon:</numerusform><numerusform>Niepowodzenie następujących ikon:</numerusform><numerusform>Niepowodzenie następujących ikon:</numerusform></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>Ta ikona używana jest przez %n wpis i zostanie zamieniona na ikonę domyślną. Czy na pewno chcesz ją usunąć?</numerusform><numerusform>Ta ikona używana jest przez %n wpisy i zostanie zamieniona na ikonę domyślną. Czy na pewno chcesz ją usunąć?</numerusform><numerusform>Ta ikona używana jest przez %n wpisów i zostanie zamieniona na ikonę domyślną. Czy na pewno chcesz ją usunąć?</numerusform><numerusform>Ta ikona używana jest przez %n wpisów i zostanie zamieniona na ikonę domyślną. Czy na pewno chcesz ją usunąć?</numerusform></translation>
     </message>
 </context>
 <context>
@@ -1775,9 +2274,8 @@ Może to spowodować nieprawidłowe działanie wtyczek.</translation>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation> - Klon</translation>
+        <source>%1 - Clone</source>
+        <translation>%1 - klon</translation>
     </message>
 </context>
 <context>
@@ -1822,10 +2320,6 @@ Może to spowodować nieprawidłowe działanie wtyczek.</translation>
         <translation><numerusform>Czy na pewno chcesz usunąć %n załącznik?</numerusform><numerusform>Czy na pewno chcesz usunąć %n załączniki?</numerusform><numerusform>Czy na pewno chcesz usunąć %n załączników?</numerusform><numerusform>Czy na pewno chcesz usunąć %n załączników?</numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Potwierdź usunięcie</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>Zapisz załączniki</translation>
     </message>
@@ -1862,10 +2356,13 @@ Może to spowodować nieprawidłowe działanie wtyczek.</translation>
 %1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation>Potwierdź usunięcie</translation>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>Nie można otworzyć plików:
-%1</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1949,6 +2446,106 @@ Może to spowodować nieprawidłowe działanie wtyczek.</translation>
         <source>Attachments</source>
         <translation>Załączniki</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>Tak</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>Wygeneruj token TOTP</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Zamknij</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Ogólne</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Użytkownik</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Hasło</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Wygaśnięcie</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>Atrybuty</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Załączniki</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notatki</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Autouzupełnianie</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Okno</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Sekwencja</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Wyszukiwanie</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Szukaj</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Wyczyść</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Nigdy</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[CHRONIONE]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Włączone</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Wyłączone</translation>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EntryView</name>
@@ -1987,6 +2584,19 @@ Może to spowodować nieprawidłowe działanie wtyczek.</translation>
         <source>Recycle Bin</source>
         <translation>Kosz</translation>
     </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation>[pusty]</translation>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>HostInstaller</name>
@@ -2000,61 +2610,6 @@ Może to spowodować nieprawidłowe działanie wtyczek.</translation>
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>Długość:</translation>
-    </message>
-    <message>
-        <source>Character Types</source>
-        <translation>Typy znaków</translation>
-    </message>
-    <message>
-        <source>Upper Case Letters</source>
-        <translation>Wielkie litery</translation>
-    </message>
-    <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
-    </message>
-    <message>
-        <source>Lower Case Letters</source>
-        <translation>Małe litery</translation>
-    </message>
-    <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
-    </message>
-    <message>
-        <source>Numbers</source>
-        <translation>Liczby</translation>
-    </message>
-    <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
-    </message>
-    <message>
-        <source>Special Characters</source>
-        <translation>Znaki specjalne</translation>
-    </message>
-    <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
-    </message>
-    <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Wyklucz podobnie wyglądające znaki</translation>
-    </message>
-    <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>Zapewnij, że hasło będzie zawierało znaki ze wszystkich grup</translation>
-    </message>
-    <message>
-        <source>Extended ASCII</source>
-        <translation>Rozszerzony ASCII</translation>
-    </message>
-</context>
-<context>
     <name>KMessageWidget</name>
     <message>
         <source>&amp;Close</source>
@@ -2079,6 +2634,26 @@ Może to spowodować nieprawidłowe działanie wtyczek.</translation>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Błędny klucz lub baza danych jest uszkodzona.</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation>brakuje nagłówków bazy danych</translation>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation>Nagłówek nie pasuje do hasza</translation>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>Nieprawidłowy rozmiar identyfikatora nagłówka</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>Nieprawidłowa długość pola nagłówka</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>Nieprawidłowa długość danych nagłowka</translation>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2238,10 +2813,6 @@ Może to spowodować nieprawidłowe działanie wtyczek.</translation>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation>Nieprawidłowa długość szyfru uuid</translation>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation>Nieobsługiwany szyfr</translation>
     </message>
@@ -2295,6 +2866,18 @@ Jest to migracja w jedną stronę. Nie będzie można otworzyć importowanej baz
         <source>Unsupported KeePass 2 database version.</source>
         <translation>Nieobsługiwana wersja bazy danych KeePass 2.</translation>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation>Nieprawidłowa długość szyfru uuid: %1 (długość=%2)</translation>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation>Nie można parsować UUID: %1</translation>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2367,10 +2950,6 @@ Jest to migracja w jedną stronę. Nie będzie można otworzyć importowanej baz
         <translation>Element historii z innym uuid</translation>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation>Nie można odszyfrować ciągu wejściowego</translation>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation>Znaleziono zduplikowany niestandardowy atrybut</translation>
     </message>
@@ -2419,6 +2998,14 @@ Jest to migracja w jedną stronę. Nie będzie można otworzyć importowanej baz
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation>Nie można zdekompresować pliku binarnego</translation>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation>Błąd XML:
+%1
+Wiersz %2, kolumna %3</translation>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2582,28 +3169,130 @@ Jest to migracja w jedną stronę. Nie będzie można otworzyć importowanej baz
         <source>Invalid entry field type</source>
         <translation>Nieprawidłowy typ pola wpisu</translation>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation>niezdolny do szukania pozycji treści</translation>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>Istniejący plik blokady pojedynczego wystąpienia jest nieprawidłowy. Uruchamianie nowego wystąpienia.</translation>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>Nie można utworzyć pliku blokady. Tryb pojedynczej instancji jest wyłączony.</translation>
+        <source>Import from</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Inna instancja KeePassXC jest już uruchomiona.</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Błąd krytyczny podczas testowania funkcji kryptograficznych.</translation>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Błąd</translation>
+        <source>Key Component</source>
+        <translation>Składnik klucza</translation>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation>Opis składnika klucza</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Anuluj</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation>Ustawiono składnik klucza, kliknij, aby zmienić lub usunąć</translation>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation>Dodaj %1</translation>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation>Zmień %1</translation>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation>Usuń %1</translation>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation>%1 ustawiono, kliknij, aby zmienić lub usunąć</translation>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>Przeglądaj</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Wygeneruj</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation>Plik klucza</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;Możesz dodać plik klucza zawierający losowe bajty do zwiększenia bezpieczeństwa.&lt;/p&gt;&lt;p&gt;Musisz trzymać go w tajemnicy i nigdy go nie stracić, bo zostaniesz zablokowany!&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation>Przestarzały format pliku klucza</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>Używasz przestarzałego formatu pliku klucza, który może być
+nieobsługiwany w przyszłości.
+
+Przejdź do ustawień klucza głównego i wygeneruj nowy plik klucza.</translation>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation>Błąd ładowania pliku klucza &apos;%1&apos;
+Komunikat: %2</translation>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Pliki kluczy</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Wszystkie pliki</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Utwórz plik klucza...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation>Błąd tworzenia pliku klucza</translation>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation>Nie można utworzyć pliku klucza: %1</translation>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Wybierz plik klucza</translation>
     </message>
 </context>
 <context>
@@ -2617,10 +3306,6 @@ Jest to migracja w jedną stronę. Nie będzie można otworzyć importowanej baz
         <translation>&amp;Ostatnie bazy danych</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Importuj</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation>&amp;Pomoc</translation>
     </message>
@@ -2629,14 +3314,6 @@ Jest to migracja w jedną stronę. Nie będzie można otworzyć importowanej baz
         <translation>W&amp;pisy</translation>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>Skopiuj atry&amp;but do schowka</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation>Hasło jednorazowe zależne od czasu (TOTP)</translation>
-    </message>
-    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Grupy</translation>
     </message>
@@ -2665,30 +3342,10 @@ Jest to migracja w jedną stronę. Nie będzie można otworzyć importowanej baz
         <translation>Zamknij bazę da&amp;nych</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>&amp;Nowa baza danych</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>Połącz z bazą danych KeePassX</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>&amp;Dodaj nowy wpis</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>&amp;Podgląd/Edycja wpisu</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>&amp;Usuń wpis</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>Dod&amp;aj nową grupę</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>&amp;Edytuj grupę</translation>
     </message>
@@ -2701,14 +3358,6 @@ Jest to migracja w jedną stronę. Nie będzie można otworzyć importowanej baz
         <translation>&amp;Zapisz bazę danych jako...</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Zmień główne &amp;hasło...</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>Ustawienia bazy &amp;danych</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>Ustawienia bazy danych</translation>
     </message>
@@ -2717,10 +3366,6 @@ Jest to migracja w jedną stronę. Nie będzie można otworzyć importowanej baz
         <translation>&amp;Sklonuj wpis</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>&amp;Znajdź</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>Skopi&amp;uj użytkownika</translation>
     </message>
@@ -2729,10 +3374,6 @@ Jest to migracja w jedną stronę. Nie będzie można otworzyć importowanej baz
         <translation>Skopiuj użytkownika do schowka</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>Sko&amp;piuj hasło</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>Skopiuj hasło do schowka</translation>
     </message>
@@ -2745,14 +3386,6 @@ Jest to migracja w jedną stronę. Nie będzie można otworzyć importowanej baz
         <translation>Generator hasła</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation>&amp;Wykonaj auto-uzupełnianie</translation>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>&amp;Otwórz URL</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>&amp;Zablokuj bazy danych</translation>
     </message>
@@ -2785,22 +3418,6 @@ Jest to migracja w jedną stronę. Nie będzie można otworzyć importowanej baz
         <translation>&amp;Eksportuj do pliku CSV...</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Importuj bazę danych KeePass 1...</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>Importuj plik CSV...</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Na&amp;praw bazę danych...</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>Pokaż TOTP</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>Ustaw TOTP...</translation>
     </message>
@@ -2821,14 +3438,6 @@ Jest to migracja w jedną stronę. Nie będzie można otworzyć importowanej baz
         <translation>Błąd dostępu pliku konfiguracyjnego %1</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Wygląda na to, że używasz KeePassHTTP do integracji z przeglądarką. Ta funkcja została uznana za przestarzałą i zostanie usunięta w przyszłości.&lt;br&gt;Zamiast tego proszę przejść na KeePassXC-Browser! Aby uzyskać pomoc dotyczącą migracji, odwiedź nasz &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;przewodnik migracji&lt;/a&gt; (ostrzeżenie %1 z 3).&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>Tylko do odczytu</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Ustawienia</translation>
     </message>
@@ -2841,36 +3450,278 @@ Jest to migracja w jedną stronę. Nie będzie można otworzyć importowanej baz
         <translation>Zakończ KeePassXC</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Baza danych KeePass 2</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Proszę dotknąć przycisku na twoim YubiKey!</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Wszystkie pliki</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation>OSTRZEŻENIE: Używasz niestabilnej kompilacji KeePassXC!
+Istnieje duże ryzyko uszkodzenia, utrzymuj kopie zapasowe baz danych.
+Ta wersja nie jest przeznaczona do użytku produkcyjnego.</translation>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Otwieranie bazy danych</translation>
+        <source>&amp;Donate</source>
+        <translation>&amp;Wspomóż</translation>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Zapisz naprawioną bazę danych</translation>
+        <source>Report a &amp;bug</source>
+        <translation>Zgłoś &amp;błąd</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Błąd przy zapisie bazy danych.</translation>
+        <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>OSTRZEŻENIE: Twoja wersja Qt może powodować awarie KeePassXC z klawiaturą ekranową!
+Zalecamy korzystanie z AppImage dostępnego na naszej stronie pobierania.</translation>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Proszę dotknąć przycisku na twoim YubiKey!</translation>
+        <source>&amp;Import</source>
+        <translation>&amp;Importuj</translation>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
-        <translation>OSTRZEŻENIE: Używasz niestabilnej kompilacji KeePassXC!
-Istnieje duże ryzyko uszkodzenia, utrzymuj kopie zapasowe baz danych.
-Ta wersja nie jest przeznaczona do użytku produkcyjnego.</translation>
+        <source>Copy att&amp;ribute...</source>
+        <translation>Skopiuj atry&amp;but...</translation>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation>TOTP...</translation>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation>&amp;Nowa baza danych...</translation>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation>Stwórz nową bazę danych</translation>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation>&amp;Scal z bazą danych...</translation>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation>Scal z inną bazą KDBX</translation>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation>&amp;Nowy wpis</translation>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation>Dodaj nowy wpis</translation>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation>&amp;Edytuj wpis</translation>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation>Podgląd lub edycja wpisu</translation>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation>&amp;Nowa grupa</translation>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation>Dodaj nową grupę</translation>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation>Zmień &amp;klucz główny...</translation>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation>Ustawienia bazy &amp;danych...</translation>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation>Skopiuj &amp;hasło</translation>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation>Wykonaj &amp;auto-uzupełnianie</translation>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation>Otwórz &amp;URL</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation>Baza danych KeePass 1...</translation>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation>Importuj bazę danych KeePass 1</translation>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation>Plik CSV...</translation>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation>Importuj plik CSV</translation>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation>Pokaż TOTP...</translation>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation>Pokaż kod QR TOTP...</translation>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation>Tworzenie brakującego %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation>Przemieszczanie %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation>Nadpisywanie %1 [%2]</translation>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation>starszy wpis scalony z bazy danych &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation>Dodawanie kopii zapasowej dla starszego celu %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation>Dodawanie kopii zapasowej dla starszego źródła %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation>Ponowne stosowanie starszego wpisu docelowego na nowszym źródle %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation>Ponowne stosowanie starszego wpisu źródłowego na nowszym celu %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation> Synchronizacja z nowszego źródła %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation>Synchronizacja ze starszego źródła %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation>Usuwanie dziecka %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation>Usuwanie sieroty %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation>Zmieniono usunięte obiekty</translation>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation>Dodawanie brakującej ikony %1</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation>Stwórz nową bazę danych KeePassXC...</translation>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Główna</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>WizardPage</translation>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation>Ustawienia &amp;szyfrowania</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>Tutaj możesz dostosować ustawienia szyfrowania bazy danych. Nie martw się, możesz je później zmienić w ustawieniach bazy danych.</translation>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Ustawienia zaawansowane</translation>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation>Ustawienia proste</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <translation>Ustawienia szyfrowania</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>Tutaj możesz dostosować ustawienia szyfrowania bazy danych. Nie martw się, możesz je później zmienić w ustawieniach bazy danych.</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation>Klucz główny bazy danych</translation>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation>Klucz główny znany tylko tobie chroni twoją bazę danych.</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <translation>Ogólne informacje o bazie danych</translation>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation>Uzupełnij wyświetlaną nazwę i opcjonalny opis nowej bazy danych:</translation>
     </message>
 </context>
 <context>
@@ -2973,125 +3824,34 @@ Ta wersja nie jest przeznaczona do użytku produkcyjnego.</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>Wymagane jest to w celu uzyskania dostępu do baz danych z ChromeIPass albo PassIFox</translation>
-    </message>
-    <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>Włącz serwer KeePassHTTP</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Ogólne</translation>
-    </message>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>P&amp;okaż powiadomienie, gdy wymagane są poświadczenia</translation>
-    </message>
-    <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>Zwracaj tylko najlepsze dopasowania wpisów dla URL zamiast wszystkich wpisów całej domeny.</translation>
-    </message>
-    <message>
-        <source>&amp;Return only best matching entries</source>
-        <translation>Z&amp;wróć tylko najlepiej pasujące wpisy</translation>
-    </message>
-    <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Żąda&amp;j odblokowania bazy danych, jeżeli jest zablokowana</translation>
-    </message>
-    <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation>Tylko wpisy z tym samym schematem (http://, https://, ftp://, ...) są zwracane.</translation>
-    </message>
-    <message>
-        <source>&amp;Match URL schemes</source>
-        <translation>&amp;Dopasuj schematy adresów URL</translation>
-    </message>
-    <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Sortuj dopasowane wpisy według &amp;użytkownika</translation>
-    </message>
-    <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Sortuj dopasowane wpisy według &amp;tytułu</translation>
-    </message>
-    <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>U&amp;suń wszystkie współdzielone klucze szyfrujące z aktywnej bazy danych</translation>
-    </message>
-    <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>U&amp;suń wszystkie przechowywane uprawnienia z wpisów w aktywnej bazie danych</translation>
-    </message>
-    <message>
-        <source>Password Generator</source>
-        <translation>Generator hasła</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Zaawansowane</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Zawsze zezwalaj na d&amp;ostęp do wpisów</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Zawsze zezwalaj na a&amp;ktualizowanie wpisów</translation>
-    </message>
-    <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>Tylko wybrana baza danych musi być podłączona do klienta.</translation>
-    </message>
-    <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Szuk&amp;aj we wszystkich otwartych bazach danych dopasowanych wpisów</translation>
-    </message>
-    <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>Automatyczne tworzenie albo aktualizowanie pól ciągów znaków nie jest obsługiwane.</translation>
-    </message>
-    <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>&amp;Zwracaj zaawansowane pola ciągów znaków, które zaczynają się od &quot;KPH: &quot;</translation>
-    </message>
-    <message>
-        <source>HTTP Port:</source>
-        <translation>Port HTTP:</translation>
+        <source>Enter password:</source>
+        <translation>Wprowadź hasło:</translation>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Port domyślny: 19455</translation>
+        <source>Confirm password:</source>
+        <translation>Potwierdź hasło:</translation>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC będzie nasłuchiwać ten port na 127.0.0.1</translation>
+        <source>Password</source>
+        <translation>Hasło</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;Ostrzeżenie:&lt;/b&gt; Poniższe opcje mogą być niebezpieczne!</translation>
+        <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;Hasło jest podstawową metodą zabezpieczania bazy danych.&lt;/p&gt;&lt;p&gt;Dobre hasła są długie i niepowtarzalne. KeePassXC może je wygenerować dla ciebie.&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;KeePassHTTP został porzucony i zostanie usunięty w przyszłości. &lt;br&gt;Proszę zamiast tego przejść  na KeePassXC-browser! Aby uzyskać pomoc dotyczącą migracji, odwiedź nasz &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt; Przewodnik migracji&lt;/a&gt;.&lt;/p&gt;</translation>
+        <source>Password cannot be empty.</source>
+        <translation>Hasło nie może być puste.</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Nie można powiązać do uprzywilejowanych portów</translation>
+        <source>Passwords do not match.</source>
+        <translation>Hasła nie pasują do siebie.</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Nie można powiązać do uprzywilejowanych portów poniżej 1024!
-Używam domyślnego portu 19455.</translation>
+        <source>Generate master password</source>
+        <translation>Wygeneruj hasło główne</translation>
     </message>
 </context>
 <context>
@@ -3123,7 +3883,7 @@ Używam domyślnego portu 19455.</translation>
     </message>
     <message>
         <source>Upper Case Letters</source>
-        <translation>Wielkie litery</translation>
+        <translation>Duże litery</translation>
     </message>
     <message>
         <source>Lower Case Letters</source>
@@ -3162,18 +3922,10 @@ Używam domyślnego portu 19455.</translation>
         <translation>Lista słów:</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Liczba słów:</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>Separator słów:</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>Wygeneruj</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Skopiuj</translation>
     </message>
@@ -3186,10 +3938,6 @@ Używam domyślnego portu 19455.</translation>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>Zastosuj</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>Entropia: %1 bity</translation>
     </message>
@@ -3217,6 +3965,171 @@ Używam domyślnego portu 19455.</translation>
         <comment>Password quality</comment>
         <translation>Znakomita</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation>Rozszerzony ASCII</translation>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation>Zmień na tryb zaawansowany</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Zaawansowane</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation>Duże litery A do F</translation>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation>Małe litery A do F</translation>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation>Nawiasy klamrowe</translation>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation>{[(</translation>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation>Interpunkcja</translation>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation>.,:;</translation>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation>Cudzysłowy</translation>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation>&quot; &apos;</translation>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation>Matematyka</translation>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation>&lt;*+!?=</translation>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation>Myślniki</translation>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation>\_|-/</translation>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation>Logogramy</translation>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation>#$%&amp;&amp;@^`~</translation>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation>Zmień na tryb prosty</translation>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation>Prosty</translation>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation>Zestaw znaków do wykluczenia w wygenerowanym haśle</translation>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation>Nie zawiera:</translation>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation>Dodaj nieheksadecymalne litery do listy &quot;nie dołączaj&quot;</translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation>Heksadecymalne</translation>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation>Wykluczone znaki: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</translation>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation>&amp;Liczba słów:</translation>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation>Regeneruj</translation>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Usuń</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Usuń</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Wyłącz</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3237,34 +4150,18 @@ Używam domyślnego portu 19455.</translation>
         <translation>Nie można odszyfrować wiadomości</translation>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
-        <translation>Przekroczony limit czasu lub nie można podłączyć się do KeePassXC</translation>
-    </message>
-    <message>
         <source>Action cancelled or denied</source>
         <translation>Działanie anulowane lub odrzucone</translation>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation>Nie można zaszyfrować wiadomości lub nie znaleziono klucza publicznego. Czy Native Messaging jest włączone w KeePassXC?</translation>
-    </message>
-    <message>
         <source>KeePassXC association failed, try again</source>
         <translation>Skojarzenie KeePassXC nie powiodło się, spróbuj ponownie</translation>
     </message>
     <message>
-        <source>Key change was not successful</source>
-        <translation>Zmiana klucza nie powiodła się</translation>
-    </message>
-    <message>
         <source>Encryption key is not recognized</source>
         <translation>Klucz szyfrowania nie jest rozpoznawany</translation>
     </message>
     <message>
-        <source>No saved databases found</source>
-        <translation>Nie znaleziono zapisanych baz danych</translation>
-    </message>
-    <message>
         <source>Incorrect action</source>
         <translation>Nieprawidłowe działanie</translation>
     </message>
@@ -3390,10 +4287,6 @@ Używam domyślnego portu 19455.</translation>
         <translation>Wprowadź hasło by odblokować %1: </translation>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation>Nieudane ładowanie pliku klucza %1 : %2</translation>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3435,7 +4328,7 @@ Dostępne polecenia:
     </message>
     <message>
         <source>Merge two databases.</source>
-        <translation>Połącz dwie bazy danych.</translation>
+        <translation>Scal dwie bazy danych.</translation>
     </message>
     <message>
         <source>Path of the database to merge into.</source>
@@ -3478,12 +4371,6 @@ Dostępne polecenia:
         <translation>błąd odczytu z urządzenia</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>plik pusty !
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation>nieprawidłowy ciąg</translation>
     </message>
@@ -3492,30 +4379,6 @@ Dostępne polecenia:
         <translation>brak cytatu zamknięcia</translation>
     </message>
     <message>
-        <source>AES: 256-bit</source>
-        <translation>AES: 256-bitowy</translation>
-    </message>
-    <message>
-        <source>Twofish: 256-bit</source>
-        <translation>Twofish: 256-bitowy</translation>
-    </message>
-    <message>
-        <source>ChaCha20: 256-bit</source>
-        <translation>ChaCha20: 256-bitowy</translation>
-    </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – zalecany)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 4)</source>
-        <translation>AES-KDF (KDBX 4)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 3.1)</source>
-        <translation>AES-KDF (KDBX 3.1)</translation>
-    </message>
-    <message>
         <source>Group</source>
         <translation>Grupa</translation>
     </message>
@@ -3544,10 +4407,6 @@ Dostępne polecenia:
         <translation>Stworzone</translation>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
-        <translation>Przestarzała integracja z przeglądarką</translation>
-    </message>
-    <message>
         <source>Browser Integration</source>
         <translation>Integracja z przeglądarką</translation>
     </message>
@@ -3576,10 +4435,6 @@ Dostępne polecenia:
         <translation>Liczba słów dla hasła diceware.</translation>
     </message>
     <message>
-        <source>count</source>
-        <translation>liczba</translation>
-    </message>
-    <message>
         <source>Wordlist for the diceware generator.
 [Default: EFF English]</source>
         <translation>Lista słów dla generatora diceware.
@@ -3590,28 +4445,441 @@ Dostępne polecenia:
         <translation>Wygeneruj nowe hasło losowe.</translation>
     </message>
     <message>
-        <source>Length of the generated password.</source>
-        <translation>Długość wygenerowanego hasła.</translation>
+        <source>Invalid value for password length %1.</source>
+        <translation>Niepoprawna wartość długości hasła %1.</translation>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation>Nie można utworzyć wpisu ze ścieżką %1.</translation>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation>Wprowadź hasło dla nowego wpisu: </translation>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation>Błąd przy zapisie bazy danych %1.</translation>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation>Pomyślnie dodano wpis %1.</translation>
+    </message>
+    <message>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation>Skopiuj bieżące TOTP do schowka.</translation>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
-        <translation>Użyj małych liter w wygenerowanym haśle.</translation>
+        <source>Invalid timeout value %1.</source>
+        <translation>Nieprawidłowa wartość limitu czasu %1.</translation>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
-        <translation>Użyj dużych liter w wygenerowanym haśle.</translation>
+        <source>Entry %1 not found.</source>
+        <translation>Nie znaleziono wpisu %1.</translation>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
-        <translation>Użyj liczb w wygenerowanym haśle.</translation>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation>Wpis ze ścieżką %1 nie ma ustawionego TOTP.</translation>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
-        <translation>Użyj znaków specjalnych w wygenerowanym haśle.</translation>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation>Bieżące TOTP wpisu zostało skopiowane do schowka!</translation>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
-        <translation>Użyj rozszerzone ASCII w wygenerowanym haśle.</translation>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation>Hasło wpisu zostało skopiowane do schowka!</translation>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation><numerusform>Czyszczenie schowka za %1 sekundę...</numerusform><numerusform>Czyszczenie schowka za %1 sekundy...</numerusform><numerusform>Czyszczenie schowka za %1 sekund...</numerusform><numerusform>Czyszczenie schowka za %1 sekund...</numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation>Schowek wyczyszczony!</translation>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation>Cichy monit o hasło i inne wyjścia pomocnicze.</translation>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation>liczba</translation>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation>Niepoprawna wartość długości hasła: %1</translation>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation> Nie można znaleźć wpisu ze ścieżką %1.</translation>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation>Bez zmiany żadnego pola dla wpisu %1.</translation>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation>Wprowadź nowe hasło dls wpisu: </translation>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation>Błąd zapisu bazy danych: %1</translation>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation>Pomyślnie edytowano wpis %1.</translation>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation>Długość %1</translation>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation>Entropia %1</translation>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation>Log10 %1</translation>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation>Dodatkowe bity w wielu wyrazach %1</translation>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation>Typ: Bruteforce</translation>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation>Type: Słownikowy</translation>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation>Typ: Słownikowy+Leet</translation>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation>Typ: Słowa użytkownika</translation>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation>Typ: Użytkownika+Leet</translation>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation>Typ: Powtarzany</translation>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation>Typ: Sekwencja</translation>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation>Typ: Przestrzenny</translation>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation>Typ: Data</translation>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation>Typ: Bruteforce(Powt.)</translation>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation>Typ: Słownikowy(Powt.)</translation>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation>Typ: Słownikowy+Leet(Powt.)</translation>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation>Typ: Słowa użytkownika(Powt.)</translation>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation>Typ: Użytkownika+Leet(Powt.)</translation>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation>Typ: Powtarzany(Powt.)</translation>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation>Typ: Sekwencja(Powt.)</translation>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation>Typ: Przestrzenny(Powt.)</translation>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation>Typ: Data(Powt.)</translation>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation>Typ: Nieznany%1</translation>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation>Entropia %1 (%2)</translation>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation>*** Długość hasła (%1) != suma długości części (%2) ***</translation>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation>Nie udało się załadować pliku klucza %1: %2</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>Plik %1 nie istnieje.</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Nie można otworzyć pliku %1.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation>Błąd podczas odczytu bazy danych:
+%1</translation>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation>Błąd podczas parsowania bazy danych:
+%1</translation>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation>Długość wygenerowanego hasła</translation>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation>Użyj małych liter</translation>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation>Użyj dużych liter</translation>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation>Użyj liczb.</translation>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation>Użyj znaków specjalnych</translation>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation>Użyj rozszerzonego ASCII</translation>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation>Wyklucz zestaw znaków</translation>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation>znaki</translation>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation>Wyklucz podobnie wyglądające znaki</translation>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation>Uwzględnij znaki z każdej wybranej grupy</translation>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation>Rekurencyjnie wylistuj elementy grupy.</translation>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation>Nie można znaleźć grupy %1.</translation>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation>Błąd odczytu pliku scalania:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation>Nie można zapisać bazy danych do pliku : %1</translation>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation>Nie można zapisać bazy danych do pliku: %1</translation>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation>Pomyślnie przeniesiono do kosza wpis %1.</translation>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation>Pomyślnie usunięto wpis %1.</translation>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation>Pokaż bieżące TOTP wpisu.</translation>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation>BŁĄD: nieznany atrybut %1.</translation>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation>Nie zdefiniowano żadnego programu do manipulacji schowkiem</translation>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation>Nie można uruchomić programu %1</translation>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation>plik pusty</translation>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation>%1: (rząd, kolumna) %2,%3</translation>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256-bitowy</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256-bitowy</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256-bitowy</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – zalecany)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation>Ustawienia nieprawidłowe</translation>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation>Nieprawidłowy klucz</translation>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>Usuń wpis z bazy danych.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>Ścieżka wpisu do usunięcia.</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>Istniejący plik blokady pojedynczego wystąpienia jest nieprawidłowy. Uruchamianie nowego wystąpienia.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Nie można utworzyć pliku blokady. Tryb pojedynczej instancji jest wyłączony.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - wieloplatformowy menedżer haseł</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>nazwy plików baz danych haseł do otwarcia (*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>ścieżka do pliku z ustawieniami</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>plik klucza bazy danych</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>odczytaj hasło bazy danych z stdin</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation>Uchwyt okna nadrzędnego</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Inna instancja KeePassXC jest już uruchomiona.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Błąd krytyczny podczas testowania funkcji kryptograficznych.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Błąd</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation>Hasło bazy danych:</translation>
     </message>
 </context>
 <context>
@@ -3649,12 +4917,98 @@ Dostępne polecenia:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
+    <message>
+        <source>Agent connection failed.</source>
+        <translation>Połączenie agenta nie powiodło się.</translation>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation>Błąd protokołu agenta.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation>Żaden agent nie działa, nie można dodać tożsamości.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation>Żaden agent nie działa, nie można usunąć tożsamości.</translation>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation>Agent odmówił tej tożsamości. Możliwe przyczyny to:</translation>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation>Klucz został już dodany.</translation>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation>Ograniczony czas życia nie jest obsługiwany przez agenta (sprawdź opcje).</translation>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation>Żądanie potwierdzenia nie jest obsługiwane przez agenta (sprawdź opcje).</translation>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation>Przeszukaj pomoc</translation>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation>Zapytania wyszukiwania są następujące: [modyfikatory][pole:][&quot;]zapytanie[&quot;]</translation>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation>Każde zapytanie wyszukiwania musi pasować (tj. logiczny AND)</translation>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation>Modyfikatory</translation>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation>wyklucz zapytanie z wyników</translation>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation>dopasuj dokładnie zapytanie</translation>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation>użyj wyrażenia regularnego w zapytaniu</translation>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation>Pola</translation>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation>Wieloznacznik zapytania</translation>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation>dopasuj cokolwiek</translation>
+    </message>
     <message>
-        <source>Search...</source>
-        <translation>Szukaj...</translation>
+        <source>match one</source>
+        <translation>dopasuj jeden</translation>
     </message>
     <message>
+        <source>logical OR</source>
+        <translation>logiczny OR</translation>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation>Przykłady</translation>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
         <source>Search</source>
         <translation>Szukaj</translation>
     </message>
@@ -3663,315 +5017,316 @@ Dostępne polecenia:
         <translation>Wyczyść</translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Rozróżniaj wielkość znaków</translation>
-    </message>
-    <message>
         <source>Limit search to selected group</source>
         <translation>Ogranicz wyszukiwanie do wybranych grup</translation>
     </message>
+    <message>
+        <source>Search Help</source>
+        <translation>Przeszukaj pomoc</translation>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation>Szukaj (%1)...</translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation>Rozróżniaj wielkość znaków</translation>
+    </message>
 </context>
 <context>
-    <name>Service</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC: Nowe żądanie skojarzenia klucza</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation>Otrzymałeś żądanie skojarzenia powyższego klucza.
-Jeżeli chcesz zezwolić na dostęp do twojej bazy danych KeePassXC,
-nadaj unikatową nazwę do zidentyfikowania i zaakceptuj.</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: Nadpisać istniejący klucz?</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Współdzielony klucz szyfrujący o nazwie &quot;%1&quot; już istnieje.
-Czy chcesz go nadpisać?</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: Aktualizacja wpisu</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Czy chcesz uaktualnić informację w %1 - %2?</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Baza danych zablokowana!</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Aktywna baza danych jest zablokowana!
-Proszę odblokować wybraną bazę albo wybrać inną, która jest odblokowana.</translation>
+        <source>Key:</source>
+        <translation>Klucz:</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Usunięto klucze z bazy danych</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation><numerusform>Pomyślnie usunięto %n klucz szyfrowania z ustawień KeePassX/Http.</numerusform><numerusform>Pomyślnie usunięto %n klucze szyfrowania z ustawień KeePassX/Http.</numerusform><numerusform>Pomyślnie usunięto %n kluczy szyfrowania z ustawień KeePassX/Http.</numerusform><numerusform>Pomyślnie usunięto %n kluczy szyfrowania z ustawień KeePassX/Http.</numerusform></translation>
+        <source>Generate</source>
+        <translation>Wygeneruj</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Nie znaleziono kluczy</translation>
+        <source>Import</source>
+        <translation>Importuj</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>Nie znaleziono współdzielonych kluczy szyfrujących w ustawieniach KeePassHTTP.</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Ustawienia niedostępne!</translation>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>Aktywna baza danych nie zawiera wpisu z ustawieniami KeePassHTTP.</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>Usuwanie przechowywanych uprawnień...</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>Zaniechaj</translation>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Usunięto uprawnienia</translation>
+        <source>Remove</source>
+        <translation>Usuń</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation><numerusform>Pomyślnie usunięto uprawnienia z %n wpisu.</numerusform><numerusform>Pomyślnie usunięto uprawnienia z %n wpisów.</numerusform><numerusform>Pomyślnie usunięto uprawnienia z %n wpisów.</numerusform><numerusform>Pomyślnie usunięto uprawnienia z %n wpisów.</numerusform></translation>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Nie znaleziono wpisu z uprawnieniami!</translation>
+        <source>Status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Aktywna baza danych nie zawiera wpisu z uprawnieniami.</translation>
+        <source>Fingerprint</source>
+        <translation>Odcisk palca</translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
-        <translation>Ustawienia aplikacji</translation>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Ogólne</translation>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>Bezpieczeństwo</translation>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>Błąd dostępu pliku konfiguracyjnego %1</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>Ustawienia podstawowe</translation>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Uruchom tylko jedną instancję KeePassXC</translation>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>Pamiętaj ostatnią bazę danych</translation>
+        <source>All files</source>
+        <translation>Wszystkie pliki</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Zapamiętaj ostatnie pliki klucze i klucze sprzętowe</translation>
+        <source>Select path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Załaduj poprzednie bazy danych podczas uruchomienia</translation>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>Automatycznie zapisz przy wyjściu</translation>
+        <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"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>Automatycznie zapisz po każdej zmianie</translation>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Automatycznie przeładuj bazę danych, gdy zostanie zmodyfikowana zewnętrznie</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>Zminimalizuj po skopiowaniu do schowka</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Minimalizuj okno podczas uruchomienia aplikacji</translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>Użyj ikony grupy podczas tworzenia wpisu</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Nie zaznaczaj bazy danych jako zmodyfikowanej dla zmian innych niż dane (np. rozwijanie grup)</translation>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
-        <translation>Ukryj widok Szczegóły</translation>
+        <source>Never</source>
+        <translation>Nigdy</translation>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>Pokaż ikonę w zasobniku systemowym</translation>
+        <source>Always</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>Schowaj okno do zasobnika podczas minimalizacji</translation>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
-        <translation>Schowaj okno do zasobnika zamiast wyłączenia aplikacji</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
-        <translation>Ciemna ikona w zasobniku systemowym</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Język</translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Auto-uzupełnianie</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>Użyj tytułu wpisy, aby dopasować okna dla globalnego auto-uzupełniania</translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>Użyj adresu URL wpisy, aby dopasować okna dla globalnego auto-uzupełniania</translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation>Zawsze pytaj przed wykonaniem auto-uzupełninia</translation>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Globalny skrót auto-uzupełnianie</translation>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>Opóźnienie auto-uzupełniania</translation>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation> ms</translation>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
-        <translation>Uruchamianie</translation>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
-        <translation>Zarządzanie plikami</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation>Bezpiecznie zapisuj pliki bazy danych (może być niezgodne z Dropbox itp.)</translation>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
-        <translation>Utwórz kopię zapasową pliku bazy danych przed zapisaniem</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
-        <translation>Zarządzanie wpisami</translation>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Ogólne</translation>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
-        <translation>Limity czasowe</translation>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>Wyczyść schowek po</translation>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> s</translation>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>Zablokuj bazę danych po nieaktywności</translation>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Poręczność</translation>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Zablokuj bazy danych, gdy sesja jest zablokowana albo pokrywa jest zamknięta</translation>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>Zablokuj bazę danych po zminimalizowaniu okna</translation>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>TotpDialog</name>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>Nie wymagaj powtarzania hasła, gdy jest widoczne</translation>
+        <source>Timed Password</source>
+        <translation>Hasło zależne od czasu</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Domyślnie pokazuj hasła</translation>
+        <source>000000</source>
+        <translation>000000</translation>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
-        <translation>Ukryj hasła w panelu podglądu</translation>
+        <source>Copy</source>
+        <translation>Skopiuj</translation>
+    </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation><numerusform>Wygasa za &lt;b&gt;%n&lt;/b&gt; sekundę</numerusform><numerusform>Wygasa za &lt;b&gt;%n&lt;/b&gt; sekundy</numerusform><numerusform>Wygasa za &lt;b&gt;%n&lt;/b&gt; sekund</numerusform><numerusform>Wygasa za &lt;b&gt;%n&lt;/b&gt; sekund</numerusform></translation>
     </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
     <message>
-        <source>Hide entry notes by default</source>
-        <translation>Domyślnie ukrywaj wpisy notatek</translation>
+        <source>Copy</source>
+        <translation>Skopiuj</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>Prywatność</translation>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation>UWAGA: Te ustawienia TOTP są niestandardowe i mogą nie działać z innymi autoryzatoram.</translation>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>Użyj Google jako zastępstwa dla pobierania ikon witryn internetowych</translation>
+        <source>There was an error creating the QR code.</source>
+        <translation>Wystąpił błąd podczas tworzenia kodu QR.</translation>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
-        <translation>Ponownie zablokuj poprzednio zablokowaną bazę danych po wykonaniu auto-uzupełninia
-</translation>
+        <source>Closing in %1 seconds.</source>
+        <translation>Zamykanie za %1 sekund.</translation>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation>Ustaw TOTP</translation>
@@ -3993,59 +5348,84 @@ Proszę odblokować wybraną bazę albo wybrać inną, która jest odblokowana.<
         <translation>Użyj niestandardowych ustawień</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>Uwaga: zmień te ustawienia tylko wtedy, gdy wiesz, co robisz.</translation>
+        <source>Custom Settings</source>
+        <translation>Ustawienia niestandardowe</translation>
     </message>
     <message>
         <source>Time step:</source>
         <translation>Krok czasowy:</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8 cyfr</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> s</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>Rozmiar kodu:</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6 cyfr</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>Rozmiar kodu:</translation>
+        <source>7 digits</source>
+        <translation>7 cyfr</translation>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> s</translation>
+        <source>8 digits</source>
+        <translation>8 cyfr</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>Hasło zależne od czasu</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Skopiuj</translation>
+        <source>Close</source>
+        <translation>Zamknij</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>Wygasa za</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>sekund</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>Odblokuj bazę danych</translation>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4080,42 +5460,26 @@ Proszę odblokować wybraną bazę albo wybrać inną, która jest odblokowana.<
     </message>
 </context>
 <context>
-    <name>main</name>
-    <message>
-        <source>Remove an entry from the database.</source>
-        <translation>Usuń wpis z bazy danych.</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>Ścieżka bazy danych.</translation>
-    </message>
-    <message>
-        <source>Path of the entry to remove.</source>
-        <translation>Ścieżka wpisu do usunięcia.</translation>
-    </message>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - wieloplatformowy menedżer haseł</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>nazwy plików baz danych haseł do otwarcia (*.kdbx)</translation>
+        <source>Refresh</source>
+        <translation>Odśwież</translation>
     </message>
     <message>
-        <source>path to a custom config file</source>
-        <translation>ścieżka do pliku z ustawieniami</translation>
+        <source>YubiKey Challenge-Response</source>
+        <translation>Wyzwanie-odpowiedź YubiKey</translation>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>plik klucza bazy danych</translation>
+        <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>&lt;p&gt;Jeśli jesteś właścicielem &lt;a href=&quot;https://www.yubico.com/&quot;&gt;YubiKey&lt;/a&gt;, możesz go użyć do zwiększenia bezpieczeństwa.&lt;/p&gt;&lt;p&gt;YubiKey wymaga zaprogramowania jednego z jego slotów jako&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;</translation>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>odczytaj hasło bazy danych z stdin</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation>Nie wykryto YubiKey, upewnij się, że jest włożony.</translation>
     </message>
     <message>
-        <source>Parent window handle</source>
-        <translation>Uchwyt okna nadrzędnego</translation>
+        <source>No YubiKey inserted.</source>
+        <translation>Nie włożono YubiKey.</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_pt.ts b/share/translations/keepassx_pt.ts
new file mode 100644
index 000000000..857ec6d22
--- /dev/null
+++ b/share/translations/keepassx_pt.ts
@@ -0,0 +1,5484 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt" version="2.1">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <source>About KeePassXC</source>
+        <translation>Sobre o KeePassXC</translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation>Sobre</translation>
+    </message>
+    <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation>Reporte os erros em: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
+    </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>KeePassXC é distribuído sob os termos da GNU General Public License (GPL) versão 2 ou (em sua opção) versão 3.</translation>
+    </message>
+    <message>
+        <source>Contributors</source>
+        <translation>Colaboradores</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>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Consulte os contributos no GitHub&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>Debug Info</source>
+        <translation>Informação de depuração</translation>
+    </message>
+    <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation>Inclua as seguintes informações sempre que reportar um erro:</translation>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>Copiar para a área de transferência</translation>
+    </message>
+    <message>
+        <source>Revision: %1</source>
+        <translation>Revisão: %1</translation>
+    </message>
+    <message>
+        <source>Distribution: %1</source>
+        <translation>Distribuição: %1</translation>
+    </message>
+    <message>
+        <source>Libraries:</source>
+        <translation>Bibliotecas:</translation>
+    </message>
+    <message>
+        <source>Operating system: %1
+CPU architecture: %2
+Kernel: %3 %4</source>
+        <translation>Sistema operativo: %1
+Arquitetura do CPU: %2
+Kernel: %3 %4</translation>
+    </message>
+    <message>
+        <source>Enabled extensions:</source>
+        <translation>Extensões ativas:</translation>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation>Manutenção do projeto:</translation>
+    </message>
+    <message>
+        <source>Special thanks from the KeePassXC team go to debfx for creating the original KeePassX.</source>
+        <translation>Um agradecimento especial da equipa do KeePassXC a debfx por ter criado a aplicação KeePassX.</translation>
+    </message>
+    <message>
+        <source>Version %1</source>
+        <translation>Versão %1</translation>
+    </message>
+    <message>
+        <source>Build Type: %1</source>
+        <translation>Tipo de compilação: %1</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Escrita automática</translation>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation>Integração com o navegador</translation>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation>Agente SSH</translation>
+    </message>
+    <message>
+        <source>YubiKey</source>
+        <translation>YubiKey</translation>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation>TouchID</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Nada</translation>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
+    <message>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation>Ativar agente SSH (tem que reiniciar)</translation>
+    </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Definições da aplicação</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Geral</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Segurança</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Erro de acesso ao ficheiro %1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Definições básicas</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>Arranque</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Abrir apenas uma instância do KeepassXC</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Memorizar últimas bases de dados</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Memorizar últimos ficheiros-chave e dispositivos de segurança</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Ao iniciar, carregar a última base de dados utilizada</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>Minimizar janela ao iniciar a aplicação</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>Gestão de ficheiros</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation>Guardar bases de dados em segurança (pode ser incompatível com DropBox e outros serviços)</translation>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation>Criar backup da base de dados antes de guardar</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Guardar automaticamente a cada alteração</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Guardar automaticamente ao fechar</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Não marcar base de dados como alterada para modificações não efetuadas em dados (ex.: expansão de grupos)</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Recarregar base de dados se esta for modificada externamente</translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>Gestão de entradas</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>Utilizar ícone do grupo ao criar a entrada</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Minimizar ao copiar para a área de transferência</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation>Ocultar painel de pré-visualização de entradas</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Geral</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation>Ocultar barra de ferramentas (ícones)</translation>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation>Minimizar aplicação em vez de fechar</translation>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Mostrar ícone na bandeja do sistema</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>Ícone escuro na bandeja</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Ao minimizar, ocultar a janela na bandeja do sistema</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Idioma</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Escrita automática</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>Utilizar título da entrada para fazer coincidir com a escrita automática</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>Utilizar URL da entrada para fazer coincidir com a escrita automática</translation>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>Perguntar antes de executar a escrita automática</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Atalho global para escrita automática</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation>Atraso para escrita automática</translation>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation> ms</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation>Atraso para iniciar a escrita automática</translation>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>Tempo limite</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>Limpar área de transferência após</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> seg</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>Bloquear base de dados se inativa durante</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation> min</translation>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation>Esquecer TouchID após inatividade de</translation>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>Conveniência</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Bloquear base de dados ao bloquear a sessão ou ao fechar a tampa do portátil</translation>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation>Esquecer TouchID ao bloquear a sessão ou ao fechar a tampa do portátil</translation>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>Bloquear base de dados ao minimizar a janela</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation>Bloquear novamente a base de dados depois de usar a escrita automática</translation>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>Não pedir repetição da palavra-passe se esta estiver visível</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation>Não ocultar palavras-passe durante a edição</translation>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation>Não utilizar marcadores de posição para campos vazios</translation>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation>Ocultar palavras-passe no painel de pré-visualização de entradas</translation>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>Por definição, ocultar notas da entrada</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>Privacidade</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation>Utilizar DuckDuckGo como recurso para descarregar os ícones dos sites</translation>
+    </message>
+</context>
+<context>
+    <name>AutoType</name>
+    <message>
+        <source>Couldn&apos;t find an entry that matches the window title:</source>
+        <translation>Não foi encontrada uma entrada coincidente com o título da janela:</translation>
+    </message>
+    <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>KeePassXC - Escrita automática</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Escrita automática</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation>A sintaxe da instrução de escrita automática está errada!</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation>O comando de escrita automática tem um atraso muito grande. Deseja mesmo continuar?</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation>O comando de escrita automática tem uma pressão de teclas muito lenta. Deseja mesmo continuar?</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation>O comando de escrita automática contém argumentos que se repetem muitas vezes. Deseja mesmo continuar?</translation>
+    </message>
+</context>
+<context>
+    <name>AutoTypeAssociationsModel</name>
+    <message>
+        <source>Window</source>
+        <translation>Janela</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Sequência</translation>
+    </message>
+    <message>
+        <source>Default sequence</source>
+        <translation>Sequência padrão</translation>
+    </message>
+</context>
+<context>
+    <name>AutoTypeMatchModel</name>
+    <message>
+        <source>Group</source>
+        <translation>Grupo</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Título</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Nome de utilizador</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Sequência</translation>
+    </message>
+</context>
+<context>
+    <name>AutoTypeSelectDialog</name>
+    <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>KeePassXC - Escrita automática</translation>
+    </message>
+    <message>
+        <source>Select entry to Auto-Type:</source>
+        <translation>Selecionar entrada para escrita automática:</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
+    <message>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation>KeePassXC-Browser - Confirmar acesso</translation>
+    </message>
+    <message>
+        <source>Remember this decision</source>
+        <translation>Memorizar esta escolha</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>Permitir</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Recusar</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>%1 solicitou o acesso a palavras-passe para o(s) seguinte(s) itens.
+Selecione se deseja permitir o acesso.</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation>KeePassXC-Browser - Guardar entrada</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Aceitar</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation>Existem várias bases de dados abertas.
+Selecione a base de dados correta para guardar as credenciais.</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Diálogo</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation>Necessário para aceder às suas bases de dados com KeePassXC-Browser</translation>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation>Ativar integração com o navegador</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Geral</translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation>Ativar integração para estes navegadores:</translation>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation>&amp;Google Chrome</translation>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation>&amp;Firefox</translation>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation>&amp;Chromium</translation>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation>&amp;Vivaldi</translation>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Mostrar &amp;notificação se as credenciais forem solicitadas</translation>
+    </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 esta estiver bloqueada</translation>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation>Apenas serão devolvidas as entradas com o mesmo esquema (http://, https://, ...).</translation>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation>Corresponder com os esque&amp;mas do URL (https://...)</translation>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation>Apenas devolve as melhores entradas para o URL específico em vez das entradas para o domínio.</translation>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation>Devolve&amp;r apenas as credenciais mais parecidas</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Ordenar credenciais coi&amp;ncidentes por 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 coincidentes por nome de &amp;utilizador</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Avançado</translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Nunc&amp;a perguntar antes de aceder às credenciais</translation>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Nun&amp;ca perguntar antes de atualizar as credenciais</translation>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation>Apenas a base de dados selecionada tem que estar conectada a um cliente.</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>Pesquisar por credenciais semel&amp;hantes em todas as base de dados abertas</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>A criação ou atualização dos campos de cadeias não é suportada.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>Most&amp;rar campos avançados que começem com &quot;KPH: &quot;</translation>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation>Ao iniciar, atualizar automaticamente o caminho do KeePassXC ou do binário keepassxc-proxy para os &apos;sripts&apos; nativos de mensagens.</translation>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation>Ao iniciar, atualizar ficheiros de mensagens &amp;nativas</translation>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation>Suporte à utilização de uma aplicação proxy entre o KeePassXC a a extensão do navegador.</translation>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation>Utilizar uma aplicação de &amp;proxy entre o KeePassXC e a extensão do navegador</translation>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation>Utilize um proxy personalizado caso o tenha instalado manualmente.</translation>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation>Utilizar pro&amp;xy personalizado</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Explorar...</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation>&lt;b&gt;Aviso&lt;/b&gt;: as opções seguintes podem ser perigosas!</translation>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation>Selecionar localização do proxy personalizado</translation>
+    </message>
+    <message>
+        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
+        <translation>Lamentamos mas, de momento, o KeePassXC-Browser não tem suporte a versões Snap.</translation>
+    </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation>Necessita de KeePassXC-Browser para que a integração com o navegador funcione. &lt;br /&gt;Descarregue para %1 e para %2.</translation>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation>Navegador &amp;Tor</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: </source>
+        <translation>&lt;b&gt;Atenção&lt;/b&gt;, a aplicação keepassxc-proxy não foi encontrada!&lt;br /&gt;Verifique o diretório de instalação do KeePassXC ou confirme o caminho nas definições avançadas.&lt;br /&gt;A integração com o navegador não irá funcionar sem esta aplicação.&lt;br /&gt;Caminho esperado: </translation>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation>Ficheiros executáveis</translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation>Todos os ficheiros</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"/>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation>KeePassXC: Pedido de associação da nova chave</translation>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation>Recebeu um pedido de associação para a chave acima indicada.
+
+Se quiser permitir o acesso à sua base de dados do KeePassXC,
+introduza um nome identificável e aceite o pedido.</translation>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation>Guardar e permitir acesso</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: Substituir chave existente?</translation>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>Já existe uma chave de cifra partilhada com o nome &quot;%1&quot;.
+Deseja substituir a chave existente?</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: Atualizar entrada</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Deseja atualizar as informações em %1 - %2?</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Abortar</translation>
+    </message>
+    <message>
+        <source>Converting attributes to custom data…</source>
+        <translation>A converter atributos para dados personalizados...</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation>KeePassXC: Atributos KeePassHTTP convertidos</translation>
+    </message>
+    <message>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation>Os atributos para %1 entrada(s) foram convertidos.
+%2 chaves movidas para dados personalizados.</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation><numerusform>%n chave movida para dados personalizados.</numerusform><numerusform>%n chaves movidas para dados personalizados.</numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation>KeePassXC: Não existem entradas com atributos KeePassHTTP!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation>A base de dados ativa não tem entradas com atributos KePassHTTP.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation>KeePassXC: Detetadas definições de integração legada com o navegador</translation>
+    </message>
+    <message>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation>Detetadas definições de integração legada com o navegador.
+Deseja atualizar as definições para a versão mais recente?
+Esta atualização é necessária para manter a compatibilidade com o suplemento.</translation>
+    </message>
+</context>
+<context>
+    <name>CloneDialog</name>
+    <message>
+        <source>Clone Options</source>
+        <translation>Opções de clonagem</translation>
+    </message>
+    <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation>Adicionar &apos; -Clone&apos; ao título</translation>
+    </message>
+    <message>
+        <source>Replace username and password with references</source>
+        <translation>Substituir nome de utilizador e palavra-passe por referências</translation>
+    </message>
+    <message>
+        <source>Copy history</source>
+        <translation>Histórico de cópias</translation>
+    </message>
+</context>
+<context>
+    <name>CsvImportWidget</name>
+    <message>
+        <source>Import CSV fields</source>
+        <translation>Importar campos do CSV</translation>
+    </message>
+    <message>
+        <source>filename</source>
+        <translation>nome do ficheiro</translation>
+    </message>
+    <message>
+        <source>size, rows, columns</source>
+        <translation>tamanho, linhas, colunas</translation>
+    </message>
+    <message>
+        <source>Encoding</source>
+        <translation>Codificação</translation>
+    </message>
+    <message>
+        <source>Codec</source>
+        <translation>Codificador</translation>
+    </message>
+    <message>
+        <source>Text is qualified by</source>
+        <translation>Texto qualificado por</translation>
+    </message>
+    <message>
+        <source>Fields are separated by</source>
+        <translation>Campos separados por</translation>
+    </message>
+    <message>
+        <source>Comments start with</source>
+        <translation>Comentários iniciados por</translation>
+    </message>
+    <message>
+        <source>First record has field names</source>
+        <translation>Primeiro registo tem nome dos campos</translation>
+    </message>
+    <message>
+        <source>Number of headers line to discard</source>
+        <translation>Número de linhas de cabeçalho a ignorar</translation>
+    </message>
+    <message>
+        <source>Consider &apos;\&apos; an escape character</source>
+        <translation>Considerar &apos;\&apos; como carácter de escape</translation>
+    </message>
+    <message>
+        <source>Preview</source>
+        <translation>Antevisão</translation>
+    </message>
+    <message>
+        <source>Column layout</source>
+        <translation>Disposição de colunas</translation>
+    </message>
+    <message>
+        <source>Not present in CSV file</source>
+        <translation>Não existente no ficheiro CSV</translation>
+    </message>
+    <message>
+        <source>Imported from CSV file</source>
+        <translation>Importar de ficheiro CSV</translation>
+    </message>
+    <message>
+        <source>Original data: </source>
+        <translation>Dados originais: </translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Erro</translation>
+    </message>
+    <message>
+        <source>Empty fieldname %1</source>
+        <translation>Nome de campo vazio %1</translation>
+    </message>
+    <message>
+        <source>column %1</source>
+        <translation>coluna %1</translation>
+    </message>
+    <message>
+        <source>Error(s) detected in CSV file!</source>
+        <translation>Detetado(s) erro(s) no ficheiro CSV!</translation>
+    </message>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation><numerusform>[%n mensagem ignorada]</numerusform><numerusform>[%n mensagens ignoradas]</numerusform></translation>
+    </message>
+    <message>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation>Importação CSV com erros:
+%1</translation>
+    </message>
+</context>
+<context>
+    <name>CsvParserModel</name>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation><numerusform>%n coluna,</numerusform><numerusform>%n coluna(s),</numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation>%1, %2, %3</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n byte(s)</source>
+        <translation><numerusform>%n byte</numerusform><numerusform>%n bytes</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n row(s)</source>
+        <translation><numerusform>%n linha</numerusform><numerusform>%n linhas</numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Raiz</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>%1 não existe.</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Não foi possível abrir o ficheiro %1.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation>Erro ao ler a base de dados: %1</translation>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation>Não é possível guardar porque a base de dados não tem nome.</translation>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation>Não é possível escrever no ficheiro porque este foi aberto no modo de leitura.</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation>KeePassXC - Desbloquear base de dados</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenWidget</name>
+    <message>
+        <source>Enter master key</source>
+        <translation>Introduza a chave-mestre</translation>
+    </message>
+    <message>
+        <source>Key File:</source>
+        <translation>Ficheiro-chave:</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Palavra-passe:</translation>
+    </message>
+    <message>
+        <source>Browse</source>
+        <translation>Explorar</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>Recarregar</translation>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation>Pergunta de segurança:</translation>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation>Ficheiro-chave no formato legado</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á a utilizar um formato legado que pode, no futuro, deixar
+de ser suportado.
+
+Deve considerar a geração de um novo ficheiro-chave.</translation>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation>Não mostrar novamente</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Todos os ficheiros</translation>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Ficheiros-chave</translation>
+    </message>
+    <message>
+        <source>Select key file</source>
+        <translation>Selecione o ficheiro-chave</translation>
+    </message>
+    <message>
+        <source>TouchID for quick unlock</source>
+        <translation>TouchID para desbloqueio rápido</translation>
+    </message>
+    <message>
+        <source>Unable to open the database:
+%1</source>
+        <translation>Não foi possível abrir a base de dados:
+%1</translation>
+    </message>
+    <message>
+        <source>Can't open key file:
+%1</source>
+        <translation>Não foi possível abrir o ficheiro-chave:
+%1</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
+    <message>
+        <source>Passwords</source>
+        <translation>Palavras-passe</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Definições avançadas</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Geral</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Segurança</translation>
+    </message>
+    <message>
+        <source>Master Key</source>
+        <translation>Chave-mestre</translation>
+    </message>
+    <message>
+        <source>Encryption Settings</source>
+        <translation>Definições de cifra</translation>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation>Integração com navegador</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetBrowser</name>
+    <message>
+        <source>KeePassXC-Browser settings</source>
+        <translation>Definições KeePassXC-Browser</translation>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>&amp;Desconectar de todos os navegadores</translation>
+    </message>
+    <message>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation>&amp;Esquecer definições específicas dos sites (nas entradas)</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation>Mover atributos KeePassHTTP para dados personalizados KeePassX&amp;C-Browser</translation>
+    </message>
+    <message>
+        <source>Stored keys</source>
+        <translation>Chaves guardadas</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Remover</translation>
+    </message>
+    <message>
+        <source>Delete the selected key?</source>
+        <translation>Apagar chave selecionada?</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation>Tem a certeza de que deseja apagar a chave selecionada?
+Esta ação pode impedir a ligação ao suplemento.</translation>
+    </message>
+    <message>
+        <source>Key</source>
+        <translation>Chave</translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation>Valor</translation>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation>Ative a integração com o navegador para aceder a estas definições.</translation>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation>Desconectar de todos os navegadores</translation>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation>Tem a certeza de que deseja desconectar todos os navegadores?
+Esta ação pode interferir com a ligação ao suplemento.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Nenhuma chave encontrada</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation>Não foram encontradas chaves de cifra nas definições do KeePassXC.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Chaves removidas da base de dados</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation><numerusform>Removida com sucesso %n chave de cifra das definições do KeePassXC.</numerusform><numerusform>Removidas com sucesso %n chaves de cifra das definições do KeePassXC.</numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation>Esquecer definições específicas dos sites (nas 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>Tem a certeza de que deseja esquecer as definições específicas de todas as entradas?
+Serão removidas todas as permissões para aceder às entradas.</translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>A remover permissões guardadas...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Abortar</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Permissões removidas</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation><numerusform>Removidas com sucesso as permissões de %n entrada.</numerusform><numerusform>Removidas com sucesso as permissões de %n entradas.</numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: Não existem entradas com permissões!</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>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation>Mover atributos KeePassHTTP para dados personalizados</translation>
+    </message>
+    <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>Tem a certeza de que deseja atualizar todos os dados legados para a versão mais recente?
+Esta atualização é necessária para manter a compatibilidade com o suplemento.</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation>Algoritmo de cifra:</translation>
+    </message>
+    <message>
+        <source>AES:  256 Bit   (default)</source>
+        <translation>AES:  256 bits (padrão)</translation>
+    </message>
+    <message>
+        <source>Twofish:  256 Bit</source>
+        <translation>Twofish:  256 bits</translation>
+    </message>
+    <message>
+        <source>Key Derivation Function:</source>
+        <translation>Função derivação de chave:</translation>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation>Ciclos de transformação:</translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation>Testar atraso de 1 segundo</translation>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation>Utilização de memória:</translation>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation>Paralelismo:</translation>
+    </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation>Tempo para decifrar:</translation>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation>?? s</translation>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation>Alterar</translation>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation>100 ms</translation>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation>5 s</translation>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation>Os valores mais altos oferecem mais proteção mas também pode demorar mais tempo para abrir a base de dados.</translation>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation>Formato da base de dados:</translation>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation>Apenas relevante se necessitar de utilizar a base de dados com outros programas.</translation>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation>KDBX 4.0 (recomendado)</translation>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation>KDBX 3.1</translation>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation>inalterado</translation>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Número de ciclos 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>Está a utilizar um número muito alto para a transformação de chaves com Argon2.
+
+Se mantiver este número, a sua base de dados pode levar muitas horas/dias (ou ainda mais) para ser aberta!</translation>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation>Percebi, manter número</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Número de ciclos muito baixo</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>Está a utilizar um número muito baixo para a transformação de chaves com Argon2.
+
+Se mantiver este número, a sua base de dados pode ser desbloqueada muito facilmente!</translation>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation>KDF inalterado</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation>Erro ao transformar a chave com os novos parâmetros KDF; KDF inalterado.</translation>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation><numerusform> MiB</numerusform><numerusform> MiB</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation><numerusform>processo</numerusform><numerusform>processos</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation><numerusform>%1 ms</numerusform><numerusform>%1 ms</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation>Meta-dados da base de dados</translation>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>Nome da base de dados:</translation>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation>Descrição da base de dados:</translation>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation>Nome de utilizador padrão:</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation>Definições do histórico</translation>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation>Número máximo de itens no histórico:</translation>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation>Tamanho máximo para o histórico:</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation> MiB</translation>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>Utilizar reciclagem</translation>
+    </message>
+    <message>
+        <source>Additional Database Settings</source>
+        <translation>Definições extra para a base de dados</translation>
+    </message>
+    <message>
+        <source>Enable &amp;compression (recommended)</source>
+        <translation>Ativar compr&amp;essão (recomendado)</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetKeeShare</name>
+    <message>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
+    <message>
+        <source>Add additional protection...</source>
+        <translation>Adicionar proteção extra...</translation>
+    </message>
+    <message>
+        <source>No encryption key added</source>
+        <translation>Chave de cifra não adicionada</translation>
+    </message>
+    <message>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation>Tem que adicionar, pelo menos, uma chave de cifra para proteger a sua base de dados!</translation>
+    </message>
+    <message>
+        <source>No password set</source>
+        <translation>Palavra-passe não definida</translation>
+    </message>
+    <message>
+        <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>AVISO! Não definiu uma palavra-passe. Não deve utilizar uma base de dados que não tenha uma palavra-passe definida!
+
+Tem a certeza de que deseja continuar?</translation>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation>Erro desconhecido</translation>
+    </message>
+    <message>
+        <source>Failed to change master key</source>
+        <translation>Erro ao alterar a chave-mestre</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
+    <message>
+        <source>Database Name:</source>
+        <translation>Nome da base de dados:</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation>Descrição:</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
+    <message>
+        <source>KeePass 2 Database</source>
+        <translation>Base de dados do KeePass 2</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Todos os ficheiros</translation>
+    </message>
+    <message>
+        <source>Open database</source>
+        <translation>Abrir base de dados</translation>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation>Ficheiro CSV</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>Combinar base de dados</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Abrir base de dados do KeePass 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>Base de dados do KeePass 1</translation>
+    </message>
+    <message>
+        <source>Export database to CSV file</source>
+        <translation>Exportar base de dados para ficheiro CSV</translation>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation>Erro ao escrever no ficheiro CSV.</translation>
+    </message>
+    <message>
+        <source>Database creation error</source>
+        <translation>Erro ao criar a base de dados</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>A base de dados criada não tem chave ou KDF e não pode ser guardada.
+Existe aqui um erro que deve ser reportado aos programadores.</translation>
+    </message>
+    <message>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation>O ficheiro da base de dados não existe ou não pode ser acedido.</translation>
+    </message>
+    <message>
+        <source>Select CSV file</source>
+        <translation>Selecionar ficheiro CSV</translation>
+    </message>
+    <message>
+        <source>New Database</source>
+        <translation>Nova base de dados</translation>
+    </message>
+    <message>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Nova base de dados]</translation>
+    </message>
+    <message>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Bloqueada]</translation>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Apenas leitura]</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseWidget</name>
+    <message>
+        <source>Searching...</source>
+        <translation>Pesquisar..</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
+        <translation>Tem a certeza de que deseja apagar permanentemente a entrada &quot;%1&quot;?</translation>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation>Tem a certeza de que deseja mover a entrada &quot;%1&quot; para a reciclagem?</translation>
+    </message>
+    <message numerus="yes">
+        <source>Do you really want to move %n entry(s) to the recycle bin?</source>
+        <translation><numerusform>Tem a certeza de que deseja mover %n entrada para a reciclagem?</numerusform><numerusform>Tem a certeza de que deseja mover %n entradas para a reciclagem?</numerusform></translation>
+    </message>
+    <message>
+        <source>Execute command?</source>
+        <translation>Executar 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>
+        <translation>Tem a certeza de que deseja executar este comando?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Remember my choice</source>
+        <translation>Memorizar escolha</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation>Tem a certeza de que deseja apagar permanentemente o grupo &quot;%1&quot;?</translation>
+    </message>
+    <message>
+        <source>No current database.</source>
+        <translation>Nenhuma base de dados.</translation>
+    </message>
+    <message>
+        <source>No source database, nothing to do.</source>
+        <translation>Não existe base de dados de origem, nada a fazer.</translation>
+    </message>
+    <message>
+        <source>Search Results (%1)</source>
+        <translation>Resultados da pesquisa (%1)</translation>
+    </message>
+    <message>
+        <source>No Results</source>
+        <translation>Sem resultados</translation>
+    </message>
+    <message>
+        <source>File has changed</source>
+        <translation>Ficheiro alterado</translation>
+    </message>
+    <message>
+        <source>The database file has changed. Do you want to load the changes?</source>
+        <translation>O ficheiro da base de dados foi alterado. Deseja carregar as alterações?</translation>
+    </message>
+    <message>
+        <source>Merge Request</source>
+        <translation>Pedido de combinação</translation>
+    </message>
+    <message>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation>A base de dados foi alterada e tem alterações não guardadas. 
+Deseja combinar as suas alterações?</translation>
+    </message>
+    <message>
+        <source>Empty recycle bin?</source>
+        <translation>Limpar reciclagem?</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
+        <translation>Tem a certeza de que deseja apagar permanentemente os itens da reciclagem?</translation>
+    </message>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation><numerusform>Tem a certeza de que deseja apagar %n entrada?</numerusform><numerusform>Tem a certeza de que deseja apagar %n entradas?</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation><numerusform>Apagar entrada?</numerusform><numerusform>Apagar entradas?</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation><numerusform>Mover entrada para a reciclagem?</numerusform><numerusform>Mover entradas para a reciclagem?</numerusform></translation>
+    </message>
+    <message>
+        <source>File opened in read only mode.</source>
+        <translation>Ficheiro aberto no modo de leitura.</translation>
+    </message>
+    <message>
+        <source>Lock Database?</source>
+        <translation>Bloquear base de dados?</translation>
+    </message>
+    <message>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation>Está a editar uma entrada. Rejeitar alterações e bloquear?</translation>
+    </message>
+    <message>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot; foi modificada.
+Guardar alterações?</translation>
+    </message>
+    <message>
+        <source>Database was modified.
+Save changes?</source>
+        <translation>A base de dados foi modificada.
+Guardar alterações?</translation>
+    </message>
+    <message>
+        <source>Save changes?</source>
+        <translation>Guardar alterações?</translation>
+    </message>
+    <message>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation>Não foi possível abrir a nova base de dados durante o carregamento
+Erro: %1</translation>
+    </message>
+    <message>
+        <source>Disable safe saves?</source>
+        <translation>Desativar salvaguardas?</translation>
+    </message>
+    <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>O KeePassXC não conseguiu guardar a base de dados múltiplas vezes. Muito provavelmente, os serviços de sincronização não o permitiram.
+Desativar salvaguardas e tentar novamente?</translation>
+    </message>
+    <message>
+        <source>Writing the database failed.
+%1</source>
+        <translation>Erro ao escrever na base de dados:
+%1</translation>
+    </message>
+    <message>
+        <source>Passwords</source>
+        <translation>Palavras-passe</translation>
+    </message>
+    <message>
+        <source>Save database as</source>
+        <translation>Guardar base de dados como</translation>
+    </message>
+    <message>
+        <source>KeePass 2 Database</source>
+        <translation>Base de dados do KeePass 2</translation>
+    </message>
+    <message>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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>
+    </message>
+    <message>
+        <source>Delete group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidget</name>
+    <message>
+        <source>Entry</source>
+        <translation>Entrada</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Avançado</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Ícone</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Escrita automática</translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation>Propriedades</translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation>Histórico</translation>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation>Agente SSH</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>n/d</translation>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation>(cifrada)</translation>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation>Selecionar chave privada</translation>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation>Ficheiro muito grande para ser uma chave privada</translation>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation>Erro ao abrir a chave privada</translation>
+    </message>
+    <message>
+        <source>Entry history</source>
+        <translation>Histórico da entrada</translation>
+    </message>
+    <message>
+        <source>Add entry</source>
+        <translation>Adicionar entrada</translation>
+    </message>
+    <message>
+        <source>Edit entry</source>
+        <translation>Editar entrada</translation>
+    </message>
+    <message>
+        <source>Different passwords supplied.</source>
+        <translation>As palavras-passe não são iguais.</translation>
+    </message>
+    <message>
+        <source>New attribute</source>
+        <translation>Novo atributo</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation>Tem a certeza de que deseja remover este atributo?</translation>
+    </message>
+    <message>
+        <source>Tomorrow</source>
+        <translation>Amanhã</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n month(s)</source>
+        <translation><numerusform>%n mês</numerusform><numerusform>%n meses</numerusform></translation>
+    </message>
+    <message>
+        <source>Apply generated password?</source>
+        <translation>Aplicar palavra-passe gerada?</translation>
+    </message>
+    <message>
+        <source>Do you want to apply the generated password to this entry?</source>
+        <translation>Deseja aplicar a palavra-passe gerada para esta entrada?</translation>
+    </message>
+    <message>
+        <source>Entry updated successfully.</source>
+        <translation>Entrada atualizada com sucesso.</translation>
+    </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation>A entrada tem alterações por guardar</translation>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation>Novo atributo %1</translation>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation>[PROTEGIDA] Por favor revele para ver ou editar</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n ano</numerusform><numerusform>%n anos</numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetAdvanced</name>
+    <message>
+        <source>Additional attributes</source>
+        <translation>Atributos adicionais</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Adicionar</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Remover</translation>
+    </message>
+    <message>
+        <source>Edit Name</source>
+        <translation>Editar nome</translation>
+    </message>
+    <message>
+        <source>Protect</source>
+        <translation>Proteger</translation>
+    </message>
+    <message>
+        <source>Reveal</source>
+        <translation>Mostrar</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Anexos</translation>
+    </message>
+    <message>
+        <source>Foreground Color:</source>
+        <translation>Cor principal:</translation>
+    </message>
+    <message>
+        <source>Background Color:</source>
+        <translation>Cor secundária:</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetAutoType</name>
+    <message>
+        <source>Enable Auto-Type for this entry</source>
+        <translation>Ativar escrita automática para esta entrada</translation>
+    </message>
+    <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>Utilizar sequência de escrita automática deste &amp;grupo</translation>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>&amp;Utilizar sequência personalizada de escrita automática:</translation>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation>Associação de janelas</translation>
+    </message>
+    <message>
+        <source>+</source>
+        <translation>+</translation>
+    </message>
+    <message>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <source>Window title:</source>
+        <translation>Título da janela:</translation>
+    </message>
+    <message>
+        <source>Use a specific sequence for this association:</source>
+        <translation>Utilizar sequência específica para esta associação:</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetHistory</name>
+    <message>
+        <source>Show</source>
+        <translation>Mostrar</translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation>Restaurar</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Apagar</translation>
+    </message>
+    <message>
+        <source>Delete all</source>
+        <translation>Apagar tudo</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetMain</name>
+    <message>
+        <source>URL:</source>
+        <translation>URL:</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Palavra-passe:</translation>
+    </message>
+    <message>
+        <source>Repeat:</source>
+        <translation>Repetição:</translation>
+    </message>
+    <message>
+        <source>Title:</source>
+        <translation>Título:</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notas</translation>
+    </message>
+    <message>
+        <source>Presets</source>
+        <translation>Predefinições</translation>
+    </message>
+    <message>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation>Alternar caixa de seleção para mostrar a secção de notas.</translation>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>Nome de utilizador:</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Expira</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulário</translation>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation>Remover chave do agente depois de</translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation> segundos</translation>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <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 a base de dados</translation>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation>Chave pública</translation>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation>Adicionar chave ao agente ao abrir/desbloquear a base de dados</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Comentário</translation>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation>Decifrar</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>n/d</translation>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>Copiar para a área de transferência</translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation>Chave privada</translation>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation>Ficheiro externo</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Procurar...</translation>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation>Anexo</translation>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation>Adicionar ao agente</translation>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation>Remover do agente</translation>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation>Solicitar confirmação para utilizar esta chave</translation>
+    </message>
+</context>
+<context>
+    <name>EditGroupWidget</name>
+    <message>
+        <source>Group</source>
+        <translation>Grupo</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Ícone</translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation>Propriedades</translation>
+    </message>
+    <message>
+        <source>Add group</source>
+        <translation>Adicionar grupo</translation>
+    </message>
+    <message>
+        <source>Edit group</source>
+        <translation>Editar grupo</translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation>Ativar</translation>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Desativar</translation>
+    </message>
+    <message>
+        <source>Inherit from parent group (%1)</source>
+        <translation>Herdar do grupo (%1)</translation>
+    </message>
+</context>
+<context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulário</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Palavra-passe:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditGroupWidgetMain</name>
+    <message>
+        <source>Name</source>
+        <translation>Nome</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notas</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Expira</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Pesquisa</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Escrita automática</translation>
+    </message>
+    <message>
+        <source>&amp;Use default Auto-Type sequence of parent group</source>
+        <translation>&amp;Utilizar sequência de escrita automática do grupo relacionado</translation>
+    </message>
+    <message>
+        <source>Set default Auto-Type se&amp;quence</source>
+        <translation>Definir se&amp;quência padrão para escrita automática</translation>
+    </message>
+</context>
+<context>
+    <name>EditWidgetIcons</name>
+    <message>
+        <source>&amp;Use default icon</source>
+        <translation>&amp;Utilizar ícone padrão</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>Utilizar íco&amp;ne personalizado</translation>
+    </message>
+    <message>
+        <source>Add custom icon</source>
+        <translation>Adicionar ícone personalizado</translation>
+    </message>
+    <message>
+        <source>Delete custom icon</source>
+        <translation>Apagar ícone personalizado</translation>
+    </message>
+    <message>
+        <source>Download favicon</source>
+        <translation>Descarregar &apos;favicon&apos;</translation>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation>Não foi possível obter o &apos;favicon&apos;.</translation>
+    </message>
+    <message>
+        <source>Images</source>
+        <translation>Imagens</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Todos os ficheiros</translation>
+    </message>
+    <message>
+        <source>Custom icon already exists</source>
+        <translation>Já existe um ícone personalizado</translation>
+    </message>
+    <message>
+        <source>Confirm Delete</source>
+        <translation>Confirmação de eliminação</translation>
+    </message>
+    <message>
+        <source>Custom icon successfully downloaded</source>
+        <translation>Ícone personalizado descarregado com sucesso</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>Dica: pode ativar o serviço DuckDuckGo como recurso em Ferramentas -&gt; Definições -&gt; Segurança</translation>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation>Selecionar imagens</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation><numerusform>%1 de %n ícones carregado com sucesso.</numerusform><numerusform>%1 de %n ícones carregados com sucesso.</numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation>Não foram carregados ícones</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation><numerusform>%n ícone já existe na sua base de dados.</numerusform><numerusform>%n ícones já existem na sua base de dados.</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation><numerusform>O ícone seguinte falhou:</numerusform><numerusform>Os ícones seguintes falharam:</numerusform></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 ícone é utilizado por % entrada e será substituído pelo ícone padrão. Tem a certeza de que deseja apagar o ícone?</numerusform><numerusform>Este ícone é utilizado por % entradas e será substituído pelo ícone padrão. Tem a certeza de que deseja apagar o ícone?</numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>EditWidgetProperties</name>
+    <message>
+        <source>Created:</source>
+        <translation>Criada:</translation>
+    </message>
+    <message>
+        <source>Modified:</source>
+        <translation>Modificada:</translation>
+    </message>
+    <message>
+        <source>Accessed:</source>
+        <translation>Acedida:</translation>
+    </message>
+    <message>
+        <source>Uuid:</source>
+        <translation>UUID:</translation>
+    </message>
+    <message>
+        <source>Plugin Data</source>
+        <translation>Dados do suplemento</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Remover</translation>
+    </message>
+    <message>
+        <source>Delete plugin data?</source>
+        <translation>Apagar dados do suplemento?</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete the selected plugin data?
+This may cause the affected plugins to malfunction.</source>
+        <translation>Tem a certeza de que deseja apagar os dados do suplemento?
+Esta ação pode implicar um funcionamento errático.</translation>
+    </message>
+    <message>
+        <source>Key</source>
+        <translation>Chave</translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation>Valor</translation>
+    </message>
+</context>
+<context>
+    <name>Entry</name>
+    <message>
+        <source>%1 - Clone</source>
+        <translation>%1 - Clone</translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Nome</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Tamanho</translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulário</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Adicionar</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Remover</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Abrir</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Guardar</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation>Selecionar ficheiros</translation>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation><numerusform>Tem a certeza de que deseja remover %n anexo?</numerusform><numerusform>Tem a certeza de que deseja remover %n anexos?</numerusform></translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation>Guardar anexos</translation>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation>Não foi possível criar o diretório:
+%1</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation>Tem a certeza de que deseja substituir o ficheiro &quot;%1&quot; pelo anexo?</translation>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation>Confirmação de substituição</translation>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation>Não foi possível guardar os anexos:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation>Não foi possível abrir o anexo:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation>Não foi possível abrir os anexos:
+%1</translation>
+    </message>
+    <message>
+        <source>Confirm remove</source>
+        <translation>Confirmação de remoção</translation>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
+%1</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttributesModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Nome</translation>
+    </message>
+</context>
+<context>
+    <name>EntryHistoryModel</name>
+    <message>
+        <source>Last modified</source>
+        <translation>Última modificação</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Título</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Nome de utilizador</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+</context>
+<context>
+    <name>EntryModel</name>
+    <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation>Ref: </translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation>Grupo</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Título</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Nome de utilizador</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Nunca</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Palavra-passe</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notas</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Expira</translation>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation>Criada</translation>
+    </message>
+    <message>
+        <source>Modified</source>
+        <translation>Modificada</translation>
+    </message>
+    <message>
+        <source>Accessed</source>
+        <translation>Acedida</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Anexos</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Sim</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>A gerar token TOTP</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Fechar</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Geral</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Nome de utilizador</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Palavra-passe</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Expira</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>Atributos</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Anexos</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notas</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Escrita automática</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Janela</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Sequência</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Pesquisa</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Pesquisa</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Limpar</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Nunca</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[PROTEGIDA]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Ativada</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Desativada</translation>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryView</name>
+    <message>
+        <source>Customize View</source>
+        <translation>Vista personalizada</translation>
+    </message>
+    <message>
+        <source>Hide Usernames</source>
+        <translation>Ocultar nome de utilizador</translation>
+    </message>
+    <message>
+        <source>Hide Passwords</source>
+        <translation>Ocultar palavras-passe</translation>
+    </message>
+    <message>
+        <source>Fit to window</source>
+        <translation>Ajustar à janela</translation>
+    </message>
+    <message>
+        <source>Fit to contents</source>
+        <translation>Ajustar ao conteúdo</translation>
+    </message>
+    <message>
+        <source>Reset to defaults</source>
+        <translation>Repor predefinições</translation>
+    </message>
+    <message>
+        <source>Attachments (icon)</source>
+        <translation>Anexos (ícone)</translation>
+    </message>
+</context>
+<context>
+    <name>Group</name>
+    <message>
+        <source>Recycle Bin</source>
+        <translation>Reciclagem</translation>
+    </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation>[vazia]</translation>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation>KeePassXC: Ficheiro não guardado!</translation>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation>Não foi possível guardar o ficheiro de mensagens nativas.</translation>
+    </message>
+</context>
+<context>
+    <name>KMessageWidget</name>
+    <message>
+        <source>&amp;Close</source>
+        <translation>Fe&amp;char</translation>
+    </message>
+    <message>
+        <source>Close message</source>
+        <translation>Fechar mensagem</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Não foi possível calcular a chave-mestre</translation>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Não foi possível emitir a pergunta de segurança.</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>Chave errada ou base de dados danificada.</translation>
+    </message>
+    <message>
+        <source>missing database headers</source>
+        <translation>cabeçalhos em falta</translation>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation>Disparidade de &apos;hash&apos; no cabeçalho</translation>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>Tamanho do id do cabeçalho inválido</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>Comprimento do campo de cabeçalho inválido</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>Comprimento dos dados de cabeçalho inválido</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Não foi possível emitir a pergunta de segurança.</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Não foi possível calcular a chave-mestre</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation>cabeçalhos em falta</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Não foi possível calcular a chave-mestre</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation>Tamanho inválido para o &apos;checksum&apos; do cabeçalho</translation>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation>Disparidade no cabeçalho SHA256</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation>Chave errada ou base de dados danificada (disparidade HMAC)</translation>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation>Cifra desconhecida</translation>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>Tamanho do id do cabeçalho inválido</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>Comprimento do campo de cabeçalho inválido</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>Comprimento dos dados de cabeçalho inválido</translation>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation>Erro ao processar os parâmetros KDF no cabeçalho</translation>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation>Função de derivação de chave (KDF) não suportada ou parâmetros inválidos</translation>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation>Encontrados campos legados no ficheiro KDBX4.</translation>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation>Tamanho do id do cabeçalho interno inválido</translation>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation>Comprimento do campo de cabeçalho interno inválido</translation>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation>Tamanho binário do cabeçalho interno inválido</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Versão não suportada do mapa variante KeePass.</translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Comprimento inválido no nome da entrada da variante do mapa</translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Dados inválidos no nome da entrada da variante do mapa</translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Comprimento inválido no valor de entrada do mapa</translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation>Dados inválidos no valor da entrada da variante do mapa</translation>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Comprimento inválido do valor booleano da entrada da variante do mapa</translation>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Comprimento inválido do valor da entrada Int32 da variante do mapa</translation>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Comprimento inválido do valor da entrada UInt32 da variante do mapa</translation>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Comprimento inválido do valor da entrada Int64 da variante do mapa</translation>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Comprimento inválido do valor da entrada UInt64 da variante do mapa</translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Tipo inválido da entrada da variante do mapa</translation>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Tamanho inválido do tipo de campo da variante do mapa</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation>Algoritmo inválido de cifra simétrica.</translation>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation>Tamanho inválido da cifra simétrica IV.</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Não foi possível calcular a chave-mestre</translation>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation>Erro ao serializar os parâmetros KDF da variante do mapa</translation>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation>Cifra não suportada</translation>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation>Comprimento inválido da compressão de flags</translation>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation>Algoritmo de compressão não suportado</translation>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation>Tamanho inválido da semente mestre</translation>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation>Tamanho inválido da semente de transformação</translation>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation>Tamanho inválido para os ciclos de transformação</translation>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation>Tamanho inválido dos bytes iniciais</translation>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation>Tamanho inválido do ID do fluxo aleatório</translation>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation>Cifra inválida de fluxo aleatório interno</translation>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>Não é uma base de dados do 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>O ficheiro selecionado é uma base de dados do KeePass 1 (.kdb).
+
+Pode importá-lo clicando em Base de dados - &gt; &apos;Importar base de dados do KeePass 1...&apos;.
+Esta é uma migração unidirecional. Não será possível abrir a base de dados importada com a versão 0.4 do KeePassX.</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation>Versão da base de dados KeePass2 não suportada.</translation>
+    </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation>Tamanho inválido para o UUID da cifra: %1 (tamanho=%2)</translation>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation>Não foi possível processar UUID: %1</translation>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation>Erro ao processar o XML: %1</translation>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation>Sem grupo root</translation>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation>Dados ou UUID do ícone em falta</translation>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation>Valor ou chave de dados personalizados em falta</translation>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation>Múltiplos elementos de grupo</translation>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation>UUID de grupo nulo</translation>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation>Número inválido de ícone de grupo</translation>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation>Valor inválido para EnableAutoType</translation>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation>Valor inválido para EnableSearching</translation>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation>UUID de grupo não encontrado</translation>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation>UUID nulo em DeleteObject</translation>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation>Tempo ou UUID em falta para DeletedObject</translation>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation>Entrada de UUID nula</translation>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation>Número inválido na entrada de ícone</translation>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation>Elemento de histórico na entrada do histórico</translation>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation>Não foi encontrado o UUID da entrada</translation>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation>Elemento do histórico com UUID diferente</translation>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation>Encontrado atributo personalizado em duplicado</translation>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation>Chave &apos;string&apos; ou valor em falta</translation>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation>Encontrado anexo em duplicado</translation>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation>Chave binária ou valor em falta</translation>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation>Associação de escrita automática ou sequência em falta</translation>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation>Valor booleano inválido</translation>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation>Valor de data/hora inválido</translation>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation>Valor de cor inválido</translation>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation>Parte da cor RGB inválida</translation>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation>Valor numérico inválido</translation>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation>Valor UUID inválido</translation>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation>Não foi possível descomprimir o binário</translation>
+    </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation>Erro no XML:
+%1
+Linha %2, coluna %3</translation>
+    </message>
+</context>
+<context>
+    <name>KeePass1OpenWidget</name>
+    <message>
+        <source>Import KeePass1 database</source>
+        <translation>Importar base de dados do KeePass 1</translation>
+    </message>
+    <message>
+        <source>Unable to open the database.</source>
+        <translation>Não foi possível abrir a base de dados.</translation>
+    </message>
+</context>
+<context>
+    <name>KeePass1Reader</name>
+    <message>
+        <source>Unable to read keyfile.</source>
+        <translation>Não foi possível ler o ficheiro-chave.</translation>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>Não é uma base de dados do KeePass.</translation>
+    </message>
+    <message>
+        <source>Unsupported encryption algorithm.</source>
+        <translation>Algoritmo de cifra não suportado.</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass database version.</source>
+        <translation>Versão da base de dados KeePass não suportada.</translation>
+    </message>
+    <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation>Não foi possível ler a cifra IV</translation>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation>Número inválido de grupos</translation>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation>Número inválido de entradas</translation>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation>Tamanho inválido para a &apos;hash&apos; do conteúdo</translation>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation>Tamanho inválido da semente de transformação</translation>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation>Número inválido para os ciclos de transformação</translation>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation>Não foi possível criar a árvore de grupo</translation>
+    </message>
+    <message>
+        <source>Root</source>
+        <translation>Raiz</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Não foi possível calcular a chave-mestre</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>Chave errada ou base de dados danificada.</translation>
+    </message>
+    <message>
+        <source>Key transformation failed</source>
+        <translation>Erro ao transformar a chave</translation>
+    </message>
+    <message>
+        <source>Invalid group field type number</source>
+        <translation>Número inválido do tipo de grupo de campo</translation>
+    </message>
+    <message>
+        <source>Invalid group field size</source>
+        <translation>Tamanho inválido do grupo de campo</translation>
+    </message>
+    <message>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation>Leitura de grupo de dados do campo não coincidem no tamanho</translation>
+    </message>
+    <message>
+        <source>Incorrect group id field size</source>
+        <translation>Tamanho incorreto de campo de ID de grupo</translation>
+    </message>
+    <message>
+        <source>Incorrect group creation time field size</source>
+        <translation>Tamanho incorreto do campo do grupo de tempo de criação</translation>
+    </message>
+    <message>
+        <source>Incorrect group modification time field size</source>
+        <translation>Tamanho de campo de hora de alteração de grupo incorreto</translation>
+    </message>
+    <message>
+        <source>Incorrect group access time field size</source>
+        <translation>Tamanho de campo de tempo de acesso de grupo incorreto</translation>
+    </message>
+    <message>
+        <source>Incorrect group expiry time field size</source>
+        <translation>Tamanho de campo de tempo de expiração de grupo incorreto</translation>
+    </message>
+    <message>
+        <source>Incorrect group icon field size</source>
+        <translation>Tamanho do campo do ícone de grupo incorreto</translation>
+    </message>
+    <message>
+        <source>Incorrect group level field size</source>
+        <translation>Tamanho de campo do nível de grupo incorreto</translation>
+    </message>
+    <message>
+        <source>Invalid group field type</source>
+        <translation>Tipo inválido para o campo de grupo</translation>
+    </message>
+    <message>
+        <source>Missing group id or level</source>
+        <translation>ID ou nível de grupo em falta</translation>
+    </message>
+    <message>
+        <source>Missing entry field type number</source>
+        <translation>Falta a entrada de tipo número no campo</translation>
+    </message>
+    <message>
+        <source>Invalid entry field size</source>
+        <translation>Tamanho inválido para o campo da entrada</translation>
+    </message>
+    <message>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation>Dados de campo de entrada não coincidem no tamanho</translation>
+    </message>
+    <message>
+        <source>Invalid entry uuid field size</source>
+        <translation>Tamanho da entrada para o campo UUID inválido</translation>
+    </message>
+    <message>
+        <source>Invalid entry group id field size</source>
+        <translation>Tamanho da entrada para o campo identificador de grupo inválido</translation>
+    </message>
+    <message>
+        <source>Invalid entry icon field size</source>
+        <translation>Tamanho da entrada para o campo ícone inválido</translation>
+    </message>
+    <message>
+        <source>Invalid entry creation time field size</source>
+        <translation>Tamanho da entrada para o campo tempo de criação inválido</translation>
+    </message>
+    <message>
+        <source>Invalid entry modification time field size</source>
+        <translation>Tamanho da entrada para o campo tempo de alteração inválido</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>
+    </message>
+    <message>
+        <source>Invalid entry field type</source>
+        <translation>Tipo inválido para o campo da entrada</translation>
+    </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation>Não foi possível pesquisar no conteúdo</translation>
+    </message>
+</context>
+<context>
+    <name>KeeShare</name>
+    <message>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
+    <message>
+        <source>Key Component</source>
+        <translation>Componente chave</translation>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation>Descrição do componente chave</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation>Componente chave definido, clique para alterar ou remover</translation>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation>Adicionar %1</translation>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation>Alterar %1</translation>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation>Remover %1</translation>
+    </message>
+    <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>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>Explorar</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Gerar</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation>Ficheiro-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;Para mais segurança, pode adicionar um ficheiro-chave que contenha dados aleatórios.&lt;/p&gt;&lt;p&gt;Tem que o manter secreto e não o pode perder pois se o fizer não mais poderá abrir a base de dados.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation>Formato legado de ficheiro-chave</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á a utilizar um formato legado que pode, no futuro, deixar
+de ser suportado.
+
+Aceda às definições da chave-mestre para gerar um novo ficheiro-chave.</translation>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation>Erro ao carregar o ficheiro-chave %1
+Mensagem: %2</translation>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Ficheiros-chave</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Todos os ficheiros</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Criar ficheiro-chave...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation>Erro ao criar o ficheiro-chave</translation>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation>Não foi possível criar o ficheiro-chave: %1</translation>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Selecione o ficheiro-chave</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>Base &amp;de dados</translation>
+    </message>
+    <message>
+        <source>&amp;Recent databases</source>
+        <translation>Bases de dados &amp;recentes</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>Aj&amp;uda</translation>
+    </message>
+    <message>
+        <source>E&amp;ntries</source>
+        <translation>E&amp;ntradas</translation>
+    </message>
+    <message>
+        <source>&amp;Groups</source>
+        <translation>&amp;Grupos</translation>
+    </message>
+    <message>
+        <source>&amp;Tools</source>
+        <translation>Ferramen&amp;tas</translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation>&amp;Sair</translation>
+    </message>
+    <message>
+        <source>&amp;About</source>
+        <translation>&amp;Acerca</translation>
+    </message>
+    <message>
+        <source>&amp;Open database...</source>
+        <translation>Abrir base de dad&amp;os...</translation>
+    </message>
+    <message>
+        <source>&amp;Save database</source>
+        <translation>Guardar base de dado&amp;s</translation>
+    </message>
+    <message>
+        <source>&amp;Close database</source>
+        <translation>Fe&amp;char base de dados</translation>
+    </message>
+    <message>
+        <source>&amp;Delete entry</source>
+        <translation>Apagar entra&amp;da</translation>
+    </message>
+    <message>
+        <source>&amp;Edit group</source>
+        <translation>&amp;Editar grupo</translation>
+    </message>
+    <message>
+        <source>&amp;Delete group</source>
+        <translation>Apagar g&amp;rupo</translation>
+    </message>
+    <message>
+        <source>Sa&amp;ve database as...</source>
+        <translation>G&amp;uardar base de dados como...</translation>
+    </message>
+    <message>
+        <source>Database settings</source>
+        <translation>Definições da base de dados</translation>
+    </message>
+    <message>
+        <source>&amp;Clone entry</source>
+        <translation>&amp;Clonar entrada</translation>
+    </message>
+    <message>
+        <source>Copy &amp;username</source>
+        <translation>Copiar nome de &amp;utilizador</translation>
+    </message>
+    <message>
+        <source>Copy username to clipboard</source>
+        <translation>Copiar nome de utilizador para a área de transferência</translation>
+    </message>
+    <message>
+        <source>Copy password to clipboard</source>
+        <translation>Copiar palavra-passe para a área de transferência</translation>
+    </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation>Definiçõe&amp;s</translation>
+    </message>
+    <message>
+        <source>Password Generator</source>
+        <translation>Gerador de palavras-passe</translation>
+    </message>
+    <message>
+        <source>&amp;Lock databases</source>
+        <translation>B&amp;loquear bases de dados</translation>
+    </message>
+    <message>
+        <source>&amp;Title</source>
+        <translation>&amp;Título</translation>
+    </message>
+    <message>
+        <source>Copy title to clipboard</source>
+        <translation>Copiar título para a área de transferência</translation>
+    </message>
+    <message>
+        <source>&amp;URL</source>
+        <translation>&amp;URL</translation>
+    </message>
+    <message>
+        <source>Copy URL to clipboard</source>
+        <translation>Copiar URL para a área de transferência</translation>
+    </message>
+    <message>
+        <source>&amp;Notes</source>
+        <translation>&amp;Notas</translation>
+    </message>
+    <message>
+        <source>Copy notes to clipboard</source>
+        <translation>Copiar notas para a área de transferência</translation>
+    </message>
+    <message>
+        <source>&amp;Export to CSV file...</source>
+        <translation>&amp;Exportar para ficheiro CSV...</translation>
+    </message>
+    <message>
+        <source>Set up TOTP...</source>
+        <translation>Configurar TOTP...</translation>
+    </message>
+    <message>
+        <source>Copy &amp;TOTP</source>
+        <translation>Copiar &amp;TOTP</translation>
+    </message>
+    <message>
+        <source>E&amp;mpty recycle bin</source>
+        <translation>Limpar reciclage&amp;m</translation>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation>Limpar histórico</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Erro de acesso ao ficheiro %1</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Definições</translation>
+    </message>
+    <message>
+        <source>Toggle window</source>
+        <translation>Alternar janela</translation>
+    </message>
+    <message>
+        <source>Quit KeePassXC</source>
+        <translation>Sair do KeePassXC</translation>
+    </message>
+    <message>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Toque no botão da sua YubiKey!</translation>
+    </message>
+    <message>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation>AVISO: está a utilizar uma versão instável do KeePassXC!
+Existe um risco bastante grande e deve efetuar um backup da base de dados.
+Esta versão não deve ser utilizada para uma utilização regular.</translation>
+    </message>
+    <message>
+        <source>&amp;Donate</source>
+        <translation>&amp;Donativos</translation>
+    </message>
+    <message>
+        <source>Report a &amp;bug</source>
+        <translation>Reportar um &amp;erro</translation>
+    </message>
+    <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>AVISO: a versão Qt do seu sistema pode causar o encerramento do KeePassXC se estiver a utilizar o teclado no ecrã (On-Screen Keyboard)!
+Recomendamos que utilize a versão AppImage disponível no nosso site.</translation>
+    </message>
+    <message>
+        <source>&amp;Import</source>
+        <translation>&amp;Importar</translation>
+    </message>
+    <message>
+        <source>Copy att&amp;ribute...</source>
+        <translation>Copiar at&amp;ributo...</translation>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation>TOTP...</translation>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation>&amp;Nova base de dados...</translation>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation>Criar uma nova base de dados</translation>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation>Co&amp;mbinar bases de dados...</translation>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation>Combinar com outra base de dados KDBX</translation>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation>&amp;Nova entrada</translation>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation>Adicionar uma nova entrada</translation>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation>&amp;Editar entrada</translation>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation>Ver ou editar entrada</translation>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation>&amp;Novo grupo</translation>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation>Adicionar um novo grupo</translation>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation>Alterar chave-&amp;mestre...</translation>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation>&amp;Definições da base de dados...</translation>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation>Copiar &amp;palavra-passe</translation>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation>Execut&amp;ar escrita automática</translation>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation>Abrir &amp;URL</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation>Base de dados do KeePass 1...</translation>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation>Importar base de dados do KeePass 1</translation>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation>Ficheiro CSV...</translation>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation>Importar ficheiro CSV</translation>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation>Mostrar TOTP...</translation>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation>Mostrar código QR TOTP...</translation>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation>A criar %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation>A alocar %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation>A substituir %1 [%2]</translation>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation>entrada antiga combinada da base de dados %1</translation>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation>A adicionar backup para o destino antigo %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation>A adicionar backup para a origem antiga %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation>A reaplicar a entrada de destino antiga na origem recente %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation>A reaplicar a entrada de origem antiga no destinio recente %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation>A sincronizar da origem recente %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation>A sincronizar da origem antiga %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation>A apagar dependente %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation>A apagar órfão %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation>Objetos apagados alterados</translation>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation>Adicionar ícone em falta %1</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation>A criar uma nova base de dados do KeePassXC...</translation>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Raiz</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>Assistente</translation>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation>Definições de &amp;cifra</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>Aqui pode ajustar as definições de cifra da sua base de dados. Não se preocupe porque pode sempre reverter as alterações nas definições.</translation>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Definições avançadas</translation>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation>Definições básicas</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <translation>Definições de cifra</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>Aqui pode ajustar as definições de cifra da sua base de dados. Não se preocupe porque pode sempre reverter as alterações nas definições.</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation>Chave-mestre da base de dados</translation>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation>Uma chave-mestre apenas sua e que protege a base de dados.</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <translation>Informação geral sobre a base de dados</translation>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation>Preencha o nome de exibição e uma descrição extra para a sua nova base de dados:</translation>
+    </message>
+</context>
+<context>
+    <name>OpenSSHKey</name>
+    <message>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation>Chave inválida, esperada chave OpenSSH</translation>
+    </message>
+    <message>
+        <source>PEM boundary mismatch</source>
+        <translation>Disparidade nos limites PEM</translation>
+    </message>
+    <message>
+        <source>Base64 decoding failed</source>
+        <translation>Erro de descodificação Base64</translation>
+    </message>
+    <message>
+        <source>Key file way too small.</source>
+        <translation>Ficheiro-chave muito pequeno.</translation>
+    </message>
+    <message>
+        <source>Key file magic header id invalid</source>
+        <translation>ID do cabeçalho mágico do ficheiro-chave inválida</translation>
+    </message>
+    <message>
+        <source>Found zero keys</source>
+        <translation>Encontradas zero chaves</translation>
+    </message>
+    <message>
+        <source>Failed to read public key.</source>
+        <translation>Erro ao ler a chave pública.</translation>
+    </message>
+    <message>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation>Ficheiro danificado, erro ao ler a chave privada</translation>
+    </message>
+    <message>
+        <source>No private key payload to decrypt</source>
+        <translation>Não existe chave privada para decifrar</translation>
+    </message>
+    <message>
+        <source>Trying to run KDF without cipher</source>
+        <translation>A tentar executar KDF sem cifra</translation>
+    </message>
+    <message>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation>Requer frase-chave para decifrar esta chave</translation>
+    </message>
+    <message>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation>Erro na derivação da chave, ficheiro-chave danificado?</translation>
+    </message>
+    <message>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation>Erro ao decifrar, frase-chave errada?</translation>
+    </message>
+    <message>
+        <source>Unexpected EOF while reading public key</source>
+        <translation>EOF inesperado ao ler a chave pública</translation>
+    </message>
+    <message>
+        <source>Unexpected EOF while reading private key</source>
+        <translation>EOF inesperado ao ler a chave privada</translation>
+    </message>
+    <message>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation>Incapaz de escrever a chave pública porque está vazia</translation>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation>EOF inesperado ao escrever a chave pública</translation>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation>Incapaz de escrever a chave privada porque está vazia</translation>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation>EOF inesperado ao escrever a chave privada</translation>
+    </message>
+    <message>
+        <source>Unsupported key type: %1</source>
+        <translation>Tipo de chave não suportado: %1</translation>
+    </message>
+    <message>
+        <source>Unknown cipher: %1</source>
+        <translation>Cifra desconhecida: %1</translation>
+    </message>
+    <message>
+        <source>Cipher IV is too short for MD5 kdf</source>
+        <translation>Cifra IV é muito curta para MD kdf</translation>
+    </message>
+    <message>
+        <source>Unknown KDF: %1</source>
+        <translation>KDF desconhecido: %1</translation>
+    </message>
+    <message>
+        <source>Unknown key type: %1</source>
+        <translation>Tipo de chave desconhecido: %1</translation>
+    </message>
+</context>
+<context>
+    <name>PasswordEditWidget</name>
+    <message>
+        <source>Enter password:</source>
+        <translation>Introduza a palavra-passe:</translation>
+    </message>
+    <message>
+        <source>Confirm password:</source>
+        <translation>Confirmação de palavra-passe:</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Palavra-passe</translation>
+    </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;A palavra-passe é o método primário para proteger a sua base de dados.&lt;/p&gt;&lt;p&gt;As boas palavras-passe são extensão e únicas. O KeePassXC pode gerar uma palavra-passe por si.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Password cannot be empty.</source>
+        <translation>Palavra-passe não pode ser vazia.</translation>
+    </message>
+    <message>
+        <source>Passwords do not match.</source>
+        <translation>Disparidade nas palavras-passe.</translation>
+    </message>
+    <message>
+        <source>Generate master password</source>
+        <translation>Gerar palavra-passe principal</translation>
+    </message>
+</context>
+<context>
+    <name>PasswordGeneratorWidget</name>
+    <message>
+        <source>%p%</source>
+        <translation>%p%</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Palavra-passe:</translation>
+    </message>
+    <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation>qualidade</translation>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation>entropia</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Palavra-passe</translation>
+    </message>
+    <message>
+        <source>Character Types</source>
+        <translation>Tipos de caracteres</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters</source>
+        <translation>Letras maiúsculas</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters</source>
+        <translation>Letras minúsculas</translation>
+    </message>
+    <message>
+        <source>Numbers</source>
+        <translation>Números</translation>
+    </message>
+    <message>
+        <source>Special Characters</source>
+        <translation>Caracteres especiais</translation>
+    </message>
+    <message>
+        <source>Extended ASCII</source>
+        <translation>ASCII expandido</translation>
+    </message>
+    <message>
+        <source>Exclude look-alike characters</source>
+        <translation>Excluir caracteres semelhantes</translation>
+    </message>
+    <message>
+        <source>Pick characters from every group</source>
+        <translation>Obter caracteres de todos os grupos</translation>
+    </message>
+    <message>
+        <source>&amp;Length:</source>
+        <translation>&amp;Comprimento:</translation>
+    </message>
+    <message>
+        <source>Passphrase</source>
+        <translation>Frase-chave</translation>
+    </message>
+    <message>
+        <source>Wordlist:</source>
+        <translation>Lista de palavras:</translation>
+    </message>
+    <message>
+        <source>Word Separator:</source>
+        <translation>Separador de palavras:</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Copiar</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>Aceitar</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Fechar</translation>
+    </message>
+    <message>
+        <source>Entropy: %1 bit</source>
+        <translation>Entropia: %1 bit</translation>
+    </message>
+    <message>
+        <source>Password Quality: %1</source>
+        <translation>Qualidade da palavra-passe: %1</translation>
+    </message>
+    <message>
+        <source>Poor</source>
+        <comment>Password quality</comment>
+        <translation>Má</translation>
+    </message>
+    <message>
+        <source>Weak</source>
+        <comment>Password quality</comment>
+        <translation>Fraca</translation>
+    </message>
+    <message>
+        <source>Good</source>
+        <comment>Password quality</comment>
+        <translation>Boa</translation>
+    </message>
+    <message>
+        <source>Excellent</source>
+        <comment>Password quality</comment>
+        <translation>Excelente</translation>
+    </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation>ASCII expandido</translation>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation>Ativar modo avançado</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Avançado</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation>Letras maiúsculas de A até F</translation>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation>Letras minúsculas de A até F</translation>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation>Parênteses</translation>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation>{[(</translation>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation>Pontuação</translation>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation>.,:;</translation>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation>Aspas</translation>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation>&quot; &apos;</translation>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation>Matemática</translation>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation>&lt;*+!?=</translation>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation>Traços</translation>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation>\_|-/</translation>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation>Logo-gramas</translation>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation>#$%&amp;&amp;@^`~</translation>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation>Trocar para o modo básico</translation>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation>Básico</translation>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation>Conjunto de caracteres a excluir da palavra-passe gerada</translation>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation>Não incluir:</translation>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation>Adicionar letras &apos;non-hex&apos; à lista de exclusão</translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation>Hex</translation>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation>Caracteres excluídos: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</translation>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation>&amp;Número de palavras:</translation>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation>Recriar</translation>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Apagar</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Remover</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Desativar</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Database not opened</source>
+        <translation>Base de dados não aberta</translation>
+    </message>
+    <message>
+        <source>Database hash not available</source>
+        <translation>&apos;Hash&apos; da base de dados não disponível</translation>
+    </message>
+    <message>
+        <source>Client public key not received</source>
+        <translation>Chave pública do cliente não recebida</translation>
+    </message>
+    <message>
+        <source>Cannot decrypt message</source>
+        <translation>Não foi possível decifrar a mensagem</translation>
+    </message>
+    <message>
+        <source>Action cancelled or denied</source>
+        <translation>Ação cancelada ou recusada</translation>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation>Erro ao associar o KeePassXC. Tente novamente.</translation>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation>Chave de cifra não reconhecida</translation>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation>Ação incorreta</translation>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation>Recebida mensagem vazia</translation>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation>URL não disponibilizado</translation>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation>Não existem credenciais</translation>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation>Erro desconhecido</translation>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation>Adicionar entrada à base de dados.</translation>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation>Caminho da base de dados.</translation>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation>Ficheiro-chave da base de dados.</translation>
+    </message>
+    <message>
+        <source>path</source>
+        <translation>caminho</translation>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation>Nome de utilizador para a entrada.</translation>
+    </message>
+    <message>
+        <source>username</source>
+        <translation>nome de utilizador</translation>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation>URL para a entrada.</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation>Pedir palavra-passe para a entrada.</translation>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation>Gerar palavra-passe para a entrada.</translation>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation>Tamanho da palavra-passe gerada.</translation>
+    </message>
+    <message>
+        <source>length</source>
+        <translation>tamanho</translation>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation>Caminho da entrada a adicionar.</translation>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation>Copiar palavra-passe da entrada para a área de transferência.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation>Caminho da entrada a copiar.</translation>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation>Tempo limite, em segundos, antes de limpar a área de transferência.</translation>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation>Editar entrada.</translation>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation>Título para a entrada.</translation>
+    </message>
+    <message>
+        <source>title</source>
+        <translation>título</translation>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation>Caminho da entrada a editar.</translation>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation>Estimar entropia da palavra-passe.</translation>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation>Palavra-passe para a qual será estimada a entropia.</translation>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation>Executar análise avançada da palavra-passe.</translation>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation>Extrair e mostrar o conteúdo da base de dados.</translation>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation>Caminho da base de dados a extrair.</translation>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation>Introduza a palavra-passe para desbloquear %1: </translation>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation>AVISO: está a utilizar um formato legado que pode, no futuro, deixar
+de ser suportado.
+
+Deve considerar a geração de uma novo ficheiro-chave.</translation>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation>
+
+Comandos disponíveis:
+</translation>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation>Nome do comando a executar.</translation>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation>Listar entradas da base de dados.</translation>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation>Caminho do grupo a listar. Padrão é /</translation>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation>Localizar entradas rapidamente.</translation>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation>Termo de pesquisa.</translation>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation>Combinar duas bases de dados.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation>Caminho da base de dados de destino da combinação.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation>Caminho da base de dados de origem da combinação.</translation>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation>Utilizar as mesmas credenciais para ambos os ficheiros.</translation>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation>Ficheiro-chave da base de dados para a combinação.</translation>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation>Mostrar informações de uma 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>
+        <translation>Nome dos atributos a mostrar. Esta opção pode ser especificada mais do que uma vez, sendo que os atributos são mostrados um por linha, na ordem indicada. Se não especificar atributos, será dado um resumo dos atributos padrão.</translation>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation>atributo</translation>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation>Nome da entrada a mostrar.</translation>
+    </message>
+    <message>
+        <source>NULL device</source>
+        <translation>Dispositivo NULL</translation>
+    </message>
+    <message>
+        <source>error reading from device</source>
+        <translation>erro ao ler do dispositivo</translation>
+    </message>
+    <message>
+        <source>malformed string</source>
+        <translation>cadeira mal fomada</translation>
+    </message>
+    <message>
+        <source>missing closing quote</source>
+        <translation>carácter de fecho em falta</translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation>Grupo</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Título</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Nome de utilizador</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Palavra-passe</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notas</translation>
+    </message>
+    <message>
+        <source>Last Modified</source>
+        <translation>Última modificação</translation>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation>Criada</translation>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation>Integração com navegador</translation>
+    </message>
+    <message>
+        <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
+        <translation>YubiKey[%1] Pergunta de segurança - Slot %2 - %3</translation>
+    </message>
+    <message>
+        <source>Press</source>
+        <translation>Prima</translation>
+    </message>
+    <message>
+        <source>Passive</source>
+        <translation>Passiva</translation>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation>Agente SSH</translation>
+    </message>
+    <message>
+        <source>Generate a new random diceware passphrase.</source>
+        <translation>Gerar uma nova palavra-passe baseada em dados (diceware).</translation>
+    </message>
+    <message>
+        <source>Word count for the diceware passphrase.</source>
+        <translation>Número de palavras para a palavra-passe.</translation>
+    </message>
+    <message>
+        <source>Wordlist for the diceware generator.
+[Default: EFF English]</source>
+        <translation>Lista de palavras para o gerador.
+[Padrão: EFF inglês]</translation>
+    </message>
+    <message>
+        <source>Generate a new random password.</source>
+        <translation>Gerar nova palavra-passe aleatória.</translation>
+    </message>
+    <message>
+        <source>Invalid value for password length %1.</source>
+        <translation>Valor inválido para o tamanho da palavra-passe %1</translation>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation>Não foi possível criar a entrada com o caminho %1</translation>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation>Introduza a palavra-passe para a nova entrada: </translation>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation>Erro ao escrever na base de dados %1.</translation>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation>Entrada %1 adicionada com sucesso</translation>
+    </message>
+    <message>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation>Copiar TOTP atual para a área de transferência</translation>
+    </message>
+    <message>
+        <source>Invalid timeout value %1.</source>
+        <translation>Valor limite inválido %1</translation>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation>Entrada %1 não encontrada</translation>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation>A entrada com o caminho %1 não tem uma TOTP configurada.</translation>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation>TOTP da entrada atual copiada para a área de transferência!</translation>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation>Palavra-passe da entrada atual copiada para a área de transferência!</translation>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation><numerusform>A área de transferência será limpa dentro de %1 segundo...</numerusform><numerusform>A área de transferência será limpa dentro de %1 segundos...</numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation>Área de transferência limpa!</translation>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation>Silenciar pedidos de palavra-passe e outros resultados secundários.</translation>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation>número</translation>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation>Valor inválido para o tamanho da palavra-passe: %1</translation>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation>Não foi possível encontrar a entrada com o caminho %1.</translation>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation>Não foi alterado qualquer campo para a entrada %1.</translation>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation>Introduza a nova palavra-passe da entrada: </translation>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation>Erro ao escrever na base de dados: %1</translation>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation>Entrada %1 editada com sucesso.</translation>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation>Tamanho %1</translation>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation>Entropia %1</translation>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation>Log10 %1</translation>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation>Bits extra multi-palavra %1</translation>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation>Tipo: Bruteforce</translation>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation>Tipo: Dictionary</translation>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation>Tipo: Dict+Leet</translation>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation>Tipo: User Words</translation>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation>Tipo: User+Leet</translation>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation>Tipo: Repeated</translation>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation>Tipo: Sequence</translation>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation>Tipo: Spatial</translation>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation>Tipo: Date</translation>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation>Tipo: Bruteforce(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation>Tipo: Dictionary(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation>Tipo: Dict+Leet(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation>Tipo: User Words(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation>Tipo: User+Leet(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation>Tipo: Repeated(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation>Tipo: Sequence(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation>Tipo: Spatial(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation>Tipo: Date(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation>Tipo: Desconhecido%1</translation>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation>Entropia %1 (%2)</translation>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation>*** Tamanho da palavra-passe (%1) != soma do tamanho das partes (%2) ***</translation>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation>Erro ao carregar o ficheiro-chave %1: %2</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>%1 não existe.</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Não foi possível abrir o ficheiro %1.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation>Erro ao ler a base de dados:
+%1</translation>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation>Erro ao analisar a base de dados:
+%1</translation>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation>Tamanho da palavra-passe gerada</translation>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation>Utilizar letras minúsculas</translation>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation>Utilizar letras maiúsculas</translation>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation>Utilizar números</translation>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation>Utilizar caracteres especiais</translation>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation>Utilizar ASCII expandido</translation>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation>Conjunto de caracteres a excluir</translation>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation>caracteres</translation>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation>Excluir caracteres semelhantes</translation>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation>Incluir caracteres de todos os grupos selecionados</translation>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation>Listar recursivamente todos os elementos do grupo</translation>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation>Não foi possível encontrar o grupo %1.</translation>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation>Erro ao ler o ficheiro de combinação:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation>Não foi possível guardar a base de dados no ficheiro: %1</translation>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation>Não foi possível guardar a base de dados no ficheiro: %1</translation>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation>A entrada %1 foi movida para a reciclagem.</translation>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation>A entrada %1 foi eliminada.</translation>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation>Mostrar TOTP atual da entrada.</translation>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation>Erro: atributo desconhecido %1</translation>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation>Não definiu um programa para manipulação da área de transferência</translation>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation>Não foi possível iniciar %1</translation>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation>ficheiro vazio</translation>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation>%1: (linha, coluna) %2,%3</translation>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256-bit</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256-bit</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256-bit</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – recomendado)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation>Definições inválidas</translation>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation>Chave inválida</translation>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>Remover uma entrada da base de dados.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>Caminho da entrada a remover.</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>O ficheiro de bloqueio da instância única é inválido. A iniciar nova instância.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Não foi possível criar o ficheiro de bloqueio. Modo de única instância desativado.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - Gestor de palavras-passe multi-plataforma</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>nome de ficheiro das bases de dados a abrir (*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>caminho para um ficheiro de configuração personalizado</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>ficheiro-chave da base de dados</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>ler palavra-passe da base de dados a partir de stdin</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation>Gestão da janela parental</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Já está em execução uma instância do KeePassXC.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Erro fatal ao testar as funções de criptografia.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Erro</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation>Palavra-passe da base de dados: </translation>
+    </message>
+</context>
+<context>
+    <name>QtIOCompressor</name>
+    <message>
+        <source>Internal zlib error when compressing: </source>
+        <translation>Erro interno zlib durante a compressão: </translation>
+    </message>
+    <message>
+        <source>Error writing to underlying device: </source>
+        <translation>Erro de escrita no dispositivo subjacente: </translation>
+    </message>
+    <message>
+        <source>Error opening underlying device: </source>
+        <translation>Erro ao abrir o dispositivo subjacente: </translation>
+    </message>
+    <message>
+        <source>Error reading data from underlying device: </source>
+        <translation>Erro de leitura no dispositivo subjacente: </translation>
+    </message>
+    <message>
+        <source>Internal zlib error when decompressing: </source>
+        <translation>Erro interno zlib durante a descompressão: </translation>
+    </message>
+</context>
+<context>
+    <name>QtIOCompressor::open</name>
+    <message>
+        <source>The gzip format not supported in this version of zlib.</source>
+        <translation>O formato gzip não é suportado por esta versão zlib.</translation>
+    </message>
+    <message>
+        <source>Internal zlib error: </source>
+        <translation>Erro interno zlib: </translation>
+    </message>
+</context>
+<context>
+    <name>SSHAgent</name>
+    <message>
+        <source>Agent connection failed.</source>
+        <translation>Erro ao conectar com o agente.</translation>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation>Erro de protocolo do agente.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation>O agente não está em execução e não é possível adicionar a identidade.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation>O agente não está em execução e não é possível remover a identidade.</translation>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation>O agente recusou esta identidade. Causas possíveis:</translation>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation>A chave já foi adicionada.</translation>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation>O tempo de vida restrito não é suportado pelo agente (verificar opções).</translation>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation>O agente não tem suporte a pedidos de confirmação (consulte as opções).</translation>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation>Pesquisar na ajuda</translation>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation>Introduza os termos de pesquisa da seguinte forma: [modificadores][campo:][&quot;]termo[&quot;]</translation>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation>Todos os termos de pesquisa coincidentes (AND lógico)</translation>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation>Modificadores</translation>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation>excluir termo dos resultados</translation>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation>coincidência exata</translation>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation>utilizar regex no termo</translation>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation>Campos</translation>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation>Caracteres universais do termo</translation>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation>coincidência relativa</translation>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation>uma coincidência</translation>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation>OU lógico</translation>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation>Exemplos</translation>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
+        <source>Search</source>
+        <translation>Pesquisa</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Limpar</translation>
+    </message>
+    <message>
+        <source>Limit search to selected group</source>
+        <translation>Limitar pesquisa ao grupo selecionado</translation>
+    </message>
+    <message>
+        <source>Search Help</source>
+        <translation>Pesquisar na ajuda</translation>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation>Pesquisa (%1)...</translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation>Sensível ao tipo</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsWidgetKeeShare</name>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Signer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key:</source>
+        <translation>Chave:</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Gerar</translation>
+    </message>
+    <message>
+        <source>Import</source>
+        <translation>Importar</translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Trust</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ask</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Remover</translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation>Impressão digital</translation>
+    </message>
+    <message>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Todos os ficheiros</translation>
+    </message>
+    <message>
+        <source>Select path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ShareObserver</name>
+    <message>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Nunca</translation>
+    </message>
+    <message>
+        <source>Always</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TotpDialog</name>
+    <message>
+        <source>Timed Password</source>
+        <translation>Palavra-passe limitada</translation>
+    </message>
+    <message>
+        <source>000000</source>
+        <translation>000000</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Copiar</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 em &lt;b&gt;%n&lt;/b&gt; segundos</numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
+    <message>
+        <source>Copy</source>
+        <translation>Copiar</translation>
+    </message>
+    <message>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation>Nota: estas definições TOTP são personalizadas e podem não funcionar com outros autenticadores.</translation>
+    </message>
+    <message>
+        <source>There was an error creating the QR code.</source>
+        <translation>Ocorreu um erro ao criar o código QR.</translation>
+    </message>
+    <message>
+        <source>Closing in %1 seconds.</source>
+        <translation>A fechar dentro de %1 segundos.</translation>
+    </message>
+</context>
+<context>
+    <name>TotpSetupDialog</name>
+    <message>
+        <source>Setup TOTP</source>
+        <translation>Configurar TOTP</translation>
+    </message>
+    <message>
+        <source>Key:</source>
+        <translation>Chave:</translation>
+    </message>
+    <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation>Definições padrão do token RFC 6238</translation>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation>Definições do token do fluxo</translation>
+    </message>
+    <message>
+        <source>Use custom settings</source>
+        <translation>Utilizar definições personalizadas</translation>
+    </message>
+    <message>
+        <source>Custom Settings</source>
+        <translation>Definições personalizadas</translation>
+    </message>
+    <message>
+        <source>Time step:</source>
+        <translation>Avanço de tempo:</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> seg</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>Tamanho do código:</translation>
+    </message>
+    <message>
+        <source>6 digits</source>
+        <translation>6 dígitos</translation>
+    </message>
+    <message>
+        <source>7 digits</source>
+        <translation>7 dígitos</translation>
+    </message>
+    <message>
+        <source>8 digits</source>
+        <translation>8 dígitos</translation>
+    </message>
+</context>
+<context>
+    <name>UpdateCheckDialog</name>
+    <message>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Fechar</translation>
+    </message>
+    <message>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WelcomeWidget</name>
+    <message>
+        <source>Start storing your passwords securely in a KeePassXC database</source>
+        <translation>Armazene as suas palavras-passe em segurança com o KeePassXC</translation>
+    </message>
+    <message>
+        <source>Create new database</source>
+        <translation>Criar nova base de dados</translation>
+    </message>
+    <message>
+        <source>Open existing database</source>
+        <translation>Abrir base de dados existente</translation>
+    </message>
+    <message>
+        <source>Import from KeePass 1</source>
+        <translation>Importar do KeePass 1</translation>
+    </message>
+    <message>
+        <source>Import from CSV</source>
+        <translation>Importar de ficheiro CSV</translation>
+    </message>
+    <message>
+        <source>Recent databases</source>
+        <translation>Bases de dados recentes</translation>
+    </message>
+    <message>
+        <source>Welcome to KeePassXC %1</source>
+        <translation>Bem-vindo ao KeePassXC %1</translation>
+    </message>
+</context>
+<context>
+    <name>YubiKeyEditWidget</name>
+    <message>
+        <source>Refresh</source>
+        <translation>Recarregar</translation>
+    </message>
+    <message>
+        <source>YubiKey Challenge-Response</source>
+        <translation>Pergunta de segurança YubiKey</translation>
+    </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>&lt;p&gt;Se você tiver uma &lt;a href=&quot;https://www.yubico.com/&quot;&gt;YubiKey&lt;/a&gt;, pode utiliza-la para obter mais segurança.&lt;/p&gt;&lt;p&gt;A YubiKey requer que uma das suas ranhuras seja programada como uma &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;</translation>
+    </message>
+    <message>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation>Yubikey não detetada. verifique se está inserida corretamente.</translation>
+    </message>
+    <message>
+        <source>No YubiKey inserted.</source>
+        <translation>Youbikey não inserida.</translation>
+    </message>
+</context>
+</TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_pt_BR.ts b/share/translations/keepassx_pt_BR.ts
index 16550f825..4ca8aaf19 100644
--- a/share/translations/keepassx_pt_BR.ts
+++ b/share/translations/keepassx_pt_BR.ts
@@ -38,12 +38,6 @@
         <translation>Copiar para a área de transferência</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>Versão %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>Revisão: %1</translation>
     </message>
@@ -76,35 +70,48 @@ Kernel: %3 %4</translation>
         <translation>A equipe KeePassXC agradece especialmente a debfx pela criação do KeePassX original.</translation>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
-        <translation>Tipo de compilação: %1
-</translation>
+        <source>Version %1</source>
+        <translation>Versão %1</translation>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP Confirmar Acesso</translation>
+        <source>Build Type: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>Lembrar esta escolha</translation>
+        <source>Auto-Type</source>
+        <translation>Autodigitação</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Permitir</translation>
+        <source>Browser Integration</source>
+        <translation>Integração com o Navegador</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>Negar</translation>
+        <source>SSH Agent</source>
+        <translation>Agente SSH</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>%1 solicitou acesso a senhas para o(s) seguinte(s) iten(s).
-Selecione se deseja permitir o acesso.</translation>
+        <source>YubiKey</source>
+        <translation>YubiKey</translation>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation>TouchID</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Nada</translation>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -113,6 +120,277 @@ Selecione se deseja permitir o acesso.</translation>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>Habilitar Agente SSH (requer reinicialização)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Configurações do Aplicativo</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Geral</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Segurança</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Erro de acesso para o arquivo de configuração %1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Configurações Básicas</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>Inicialização</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Iniciar apenas uma única instância do KeePassXC</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Lembrar dos últimos bancos de dados</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Lembre-se de arquivos de chave passados e dongles de segurança</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Carregar bancos de dados anteriores na inicialização</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>Iniciar programa com janela minimizada</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <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>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation>Fazer cópia de segurança do banco de dados antes de salvar</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Salvar automaticamente depois de cada alteração</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Salvar automaticamente ao sair</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Não marcar o banco de dados como modificado para alterações sem dados (por exemplo, expansão de grupos)</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Automaticamente recarregar o banco de dados quando houver modificações externas</translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>Gerenciamento de entrada</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>Usar ícone de grupo na criação da entrada</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Minimizar ao copiar para área de transferência</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Geral</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Mostrar um ícone da bandeja do sistema</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>Ícone de bandeja do sistema escuro</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Ocultar janela na bandeja de sistema quando minimizada</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Idioma</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Autodigitação</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>Usar o título de entrada para coincidir com a janela para Auto-Digitar global</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>Use o URL de entrada para coincidir com a janela para Auto-Digitar global</translation>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>Sempre perguntar antes de executar o Auto-Digitar</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Atalho para Auto-Digitação Global</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation>ms</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>Tempos limite</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>Limpar área de transferência após</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> seg</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>Travar bancos de dados após inatividade de</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation> min</translation>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>Conveniência</translation>
+    </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>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>Bloquear 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>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>Quando a senha for visível não pedir para repeti-la</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>Esconder notas de entrada por padrão</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>Privacidade</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -216,6 +494,26 @@ Selecione se deseja permitir o acesso.</translation>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -289,14 +587,6 @@ Selecione se deseja permitir o acesso.</translation>
         <translation>Ordenar credenciais correspondentes por &amp;nome de usuário</translation>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>&amp;Desconectar todos os navegadores</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>Descartar todas as permissões salvas</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>Avançado</translation>
     </message>
@@ -362,14 +652,6 @@ Selecione se deseja permitir o acesso.</translation>
         <translation>&lt;b&gt;AVISO:&lt;/b&gt; As seguintes opções podem ser perigosas!</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>Arquivos Executáveis (*.exe);;Todos os Arquivos (*.*)</translation>
-    </message>
-    <message>
-        <source>Executable Files (*)</source>
-        <translation>Arquivos Executáveis (*)</translation>
-    </message>
-    <message>
         <source>Select custom proxy location</source>
         <translation>Selecione localização para o proxy</translation>
     </message>
@@ -377,6 +659,31 @@ Selecione se deseja permitir o acesso.</translation>
         <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
         <translation>Desculpe, o KeePassXC-Browser não é suportado em versões Snap no momento.</translation>
     </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation>KeePassXC-Browser é necessário para que a integração do navegador funcione. &lt;br /&gt;Faça o download de %1 e %2.</translation>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation type="unfinished"/>
+    </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: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation>Todos os arquivos</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"/>
+    </message>
 </context>
 <context>
     <name>BrowserService</name>
@@ -416,152 +723,43 @@ Você deseja sobrescreve-la?</translation>
         <translation>Deseja atualizar as informações em %1 - %2?</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Banco de dados bloqueado!</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>A base de dados ativa está bloqueada!
-Desbloqueie base de dados selecionada ou escolha outra que esteja desbloqueada.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Configurações não disponíveis!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation>O banco de dados ativo não contém uma entrada de configuração.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Nenhuma chave localizada</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation> Nenhuma chave criptográfica compartilhada encontrada nas Configurações do KeePassXC </translation>
-    </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Chaves removidas do banco de dados</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation><numerusform>Removido com êxito a chave de criptografia de %n (s) de KeePassXC configurações.</numerusform><numerusform>Removido com sucesso% n chave (s) criptográficas das configurações do KeePassXC.</numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>Removendo permissões armazenadas...</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Permissões removidas</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation><numerusform>Removido com êxito as permissões de %n entradas.</numerusform><numerusform>Removido com êxito as permissões de %n entradas.</numerusform></translation>
+        <source>Converting attributes to custom data…</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Nenhuma entrada com permissões localizada!</translation>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation type="unfinished"/>
     </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>
-    </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>Senha</translation>
-    </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>Insira senha:</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>Repita senha:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;Arquivo-Chave</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>Navegar</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Criar</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>&amp;Desafio Resposta</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Atualizar</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>Arquivos-chave</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>Todos arquivos</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>Criar Arquivo-Chave...</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>Não foi possível criar o Arquivo-Chave : </translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>Escolha um arquivo-chave</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Senha vazia</translation>
-    </message>
-    <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>Você realmente quer usar uma sequência vazia como senha?</translation>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>Senhas diferentes fornecidas.</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>Falha ao definir %1 como o Arquivo-Chave:
-%2</translation>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Legacy key file format</source>
-        <translation>Formato de chave antigo</translation>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation type="unfinished"/>
     </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.
-
-Por favor, considere gerar um novo arquivo de chave.</translation>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>Mudança da senha mestre falhou: YubiKey não inserido.</translation>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -642,14 +840,6 @@ Por favor, considere gerar um novo arquivo de chave.</translation>
         <translation>Não existe no arquivo CSV</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>Nome de campo vazio</translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>coluna</translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>Importado do arquivo CSV</translation>
     </message>
@@ -658,48 +848,84 @@ Por favor, considere gerar um novo arquivo de chave.</translation>
         <translation>Dados originais:</translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>Erro(s) detectado(s) no arquivo CSV!</translation>
+        <source>Error</source>
+        <translation>Erro</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation>mais mensagens puladas]</translation>
+        <source>Empty fieldname %1</source>
+        <translation>Nome de campo vazio %1</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Erro</translation>
+        <source>column %1</source>
+        <translation>coluna %1</translation>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>Importar CSV: escritor tem erros:
-</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>Erro</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Não foi possível calcular a chave mestre</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
-        <translation><numerusform>%n byte(s), </numerusform><numerusform>%n byte(s), </numerusform></translation>
+        <source>%n column(s)</source>
+        <translation><numerusform>%n coluna(s)</numerusform><numerusform>%n coluna(s)</numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation>%1, %2, %3</translation>
     </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
-        <translation><numerusform>%n linha(s), </numerusform><numerusform>%n linha(s), </numerusform></translation>
+        <source>%n byte(s)</source>
+        <translation><numerusform>%n byte</numerusform><numerusform>%n bytes</numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
-        <translation><numerusform>%n coluna(s)</numerusform><numerusform>%n coluna(s)</numerusform></translation>
+        <source>%n row(s)</source>
+        <translation><numerusform>%n linha</numerusform><numerusform>%n linhas</numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Raíz</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -729,14 +955,6 @@ Por favor, considere gerar um novo arquivo de chave.</translation>
         <translation>Resposta do Desafio:</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Não foi possível abrir o banco de dados.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Não foi possível abrir arquivo-chave</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation>Formato de chave antigo</translation>
     </message>
@@ -765,105 +983,168 @@ Por favor, considere-se gerar um novo arquivo de chave.</translation>
         <source>Select key file</source>
         <translation>Escolha o arquivo-chave</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>Reparar banco de dados</translation>
+        <source>TouchID for quick unlock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Erro</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Não foi possível abrir arquivo-chave</translation>
+        <source>Can't open key file:
+%1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Não foi possível abrir o banco de dados.</translation>
+        <source>Passwords</source>
+        <translation>Senhas</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Definições avançadas</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Geral</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Banco de dados aberto com sucesso. Nada para fazer.</translation>
+        <source>Security</source>
+        <translation>Segurança</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>Sucesso</translation>
+        <source>Master Key</source>
+        <translation>Chave-mestre</translation>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>O banco de dados foi reparado com sucesso
-Você pode salvá-lo agora.</translation>
+        <source>Encryption Settings</source>
+        <translation>Definições de cifra</translation>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>Não foi possível reparar o banco de dados.</translation>
+        <source>Browser Integration</source>
+        <translation>Integração com o Navegador</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>Geral</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>Encriptação</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>&amp;Desconectar todos os navegadores</translation>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Número de voltas muito alto</translation>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation type="unfinished"/>
     </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.
-
-Se você mantiver este número, seu banco de dados pode levar horas ou dias (ou até mais) para abrir!</translation>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Understood, keep number</source>
-        <translation>Entendido, manter o número</translation>
+        <source>Stored keys</source>
+        <translation>Chaves guardadas</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
+        <source>Remove</source>
+        <translation>Remover</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Número de voltas muito baixo</translation>
+        <source>Delete the selected key?</source>
+        <translation>Apagar chave selecionada?</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>Você está usando um número muito baixo de transformação chave rodadas com KDF-AES.
-
-Se você manter este número, seu banco de dados pode ser facilmente crackeado!</translation>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KDF unchanged</source>
-        <translation>KDF não modificado</translation>
+        <source>Key</source>
+        <translation>Chave</translation>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
-        <translation>Não foi possível transformar a chave com novos parâmetros KDF; KDF inalterado.</translation>
+        <source>Value</source>
+        <translation>Valor</translation>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Nenhuma chave localizada</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Chaves removidas do banco de dados</translation>
     </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
-        <translation><numerusform> MiB</numerusform><numerusform> MiB</numerusform></translation>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Removendo permissões armazenadas...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Permissões removidas</translation>
     </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
-        <translation><numerusform> thread (s)</numerusform><numerusform> thread(s)</numerusform></translation>
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: Nenhuma entrada com permissões localizada!</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>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
     </message>
 </context>
 <context>
@@ -900,6 +1181,113 @@ Se você manter este número, seu banco de dados pode ser facilmente crackeado!<
         <source>Parallelism:</source>
         <translation>Paralelismo:</translation>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation>?? s</translation>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation>Alterar</translation>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation>100 ms</translation>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation>5 s</translation>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation>KDBX 4.0 (recomendado)</translation>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation>KDBX 3.1</translation>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation>inalterado</translation>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Número de voltas 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.
+
+Se você mantiver este número, seu banco de dados pode levar horas ou dias (ou até mais) para abrir!</translation>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation>Entendido, manter o número</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Número de voltas muito baixo</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>Você está usando um número muito baixo de transformação chave rodadas com KDF-AES.
+
+Se você manter este número, seu banco de dados pode ser facilmente crackeado!</translation>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation>KDF não modificado</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation>Não foi possível transformar a chave com novos parâmetros KDF; KDF inalterado.</translation>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation><numerusform> MiB</numerusform><numerusform> MiB</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -949,91 +1337,110 @@ Se você manter este número, seu banco de dados pode ser facilmente crackeado!<
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>Raíz</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Banco de dados Keepass 2</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Todos arquivos</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Abrir banco de dados</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>Arquivo não localizado!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Não foi possível abrir o banco de dados.</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>Arquivo aberto no modo somente leitura.</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>Abrir arquivo CSV</translation>
+        <source>Add additional protection...</source>
+        <translation>Adicionar proteção adicional...</translation>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>Arquivo CSV</translation>
+        <source>No encryption key added</source>
+        <translation>Chave de cifra não adicionada</translation>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>Todos os arquivos (*)</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Juntar banco de dados</translation>
+        <source>No password set</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Abrir banco de dados KeePass 1</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 type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>Banco de dados KeePass 1</translation>
+        <source>Unknown error</source>
+        <translation>Erro desconhecido</translation>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>Fechar?</translation>
+        <source>Failed to change master key</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; está em modo de edição.
-Descartar alterações e fechar mesmo assim?</translation>
+        <source>Database Name:</source>
+        <translation>Nome do banco de dados:</translation>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>Salvar alterações?</translation>
+        <source>Description:</source>
+        <translation>Descrição:</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>&quot;%1&quot; foi modificado.
-Salvar alterações?</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Banco de dados Keepass 2</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Escrita do banco de dados falhou.</translation>
+        <source>All files</source>
+        <translation>Todos arquivos</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Senhas</translation>
+        <source>Open database</source>
+        <translation>Abrir banco de dados</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Salvar banco de dados como</translation>
+        <source>CSV file</source>
+        <translation>Arquivo CSV</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>Juntar banco de dados</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Abrir banco de dados KeePass 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>Banco de dados KeePass 1</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1044,40 +1451,40 @@ Salvar alterações?</translation>
         <translation>Falha ao gravar arquivo CSV.</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>Novo banco de dados</translation>
+        <source>Database creation error</source>
+        <translation>Erro ao criar o banco de dados</translation>
     </message>
     <message>
-        <source>locked</source>
-        <translation>trancado</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 type="unfinished"/>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>Trancar Banco de Dados</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>Não é possível trancar o banco de dados uma vez que você o está editando.
-Por favor, aperte cancelar para finalizar suas alterações ou descartá-las.</translation>
+        <source>Select CSV file</source>
+        <translation>Selecionar arquivo CSV</translation>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>Esse banco de dados foi modificado.
-Você deseja salvar o banco de dados antes de travá-lo?
-Do contrário, suas alterações serão perdidas.</translation>
+        <source>New Database</source>
+        <translation>Novo Banco de Dados</translation>
     </message>
     <message>
-        <source>Disable safe saves?</source>
-        <translation>Desativar armazenamento seguro?</translation>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Novo banco de dados]</translation>
     </message>
     <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 não pôde salvar o banco de dados após várias tentativas. Isto é causado provavelmente pelo serviço de sincronização de arquivo que mantém um bloqueio ao salvar o arquivo.
-Deseja desabilitar salvamento seguro e tentar novamente?</translation>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Bloqueada]</translation>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Apenas leitura]</translation>
     </message>
 </context>
 <context>
@@ -1087,37 +1494,13 @@ Deseja desabilitar salvamento seguro e tentar novamente?</translation>
         <translation>Pesquisando...</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>Alterar chave-mestra</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>Apagar entrada?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>Você realmente quer apagar a entrada &quot;%1&quot; para sempre?</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Apagar entradas?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Você realmente quer apagar %1 entradas para sempre?</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Mover entrada para a lixeira?</translation>
-    </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>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Mover entradas para lixeira?</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation><numerusform>Você quer realmente mudar %n entradas para a lixeira?</numerusform><numerusform>Você deseja realmente mover %n entrada(s) para a lixeira?</numerusform></translation>
@@ -1135,18 +1518,10 @@ Deseja desabilitar salvamento seguro e tentar novamente?</translation>
         <translation>Lembrar minha escolha</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Apagar grupo?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>Você realmente quer apagar o grupo &quot;%1&quot; para sempre?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Não foi possível calcular a chave mestre</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>Nenhuma base de dados atual.</translation>
     </message>
@@ -1181,10 +1556,6 @@ Do you want to merge your changes?</source>
 Você deseja combinar suas alterações?</translation>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>Não foi possível abrir a nova base de dados ao tentar recarregar automaticamente essa base de dados.</translation>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>Esvaziar lixeira?</translation>
     </message>
@@ -1192,88 +1563,104 @@ Você deseja combinar suas alterações?</translation>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>Você tem certeza que deseja apagar permanentemente tudo que está na lixeira?</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>Gerar Token TOTP</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation><numerusform>Apagar entrada?</numerusform><numerusform>Apagar entradas?</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation><numerusform>Mover entrada para a lixeira?</numerusform><numerusform>Mover entradas para a lixeira?</numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Fechar</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Arquivo aberto no modo somente leitura.</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Geral</translation>
+        <source>Lock Database?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Senha</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot; foi modificado.
+Salvar alterações?</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>Expiração</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Nome de usuário</translation>
+        <source>Save changes?</source>
+        <translation>Salvar alterações?</translation>
     </message>
     <message>
-        <source>Autotype</source>
-        <translation>Auto-Digitação</translation>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>Busca</translation>
+        <source>Disable safe saves?</source>
+        <translation>Desativar armazenamento seguro?</translation>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>Atributos</translation>
+        <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 não pôde salvar o banco de dados após várias tentativas. Isto é causado provavelmente pelo serviço de sincronização de arquivo que mantém um bloqueio ao salvar o arquivo.
+Deseja desabilitar salvamento seguro e tentar novamente?</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Anexos</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Notas</translation>
+        <source>Passwords</source>
+        <translation>Senhas</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>Janela</translation>
+        <source>Save database as</source>
+        <translation>Salvar banco de dados como</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>Sequência</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Banco de dados Keepass 2</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Pesquisar</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Limpar</translation>
+        <source>Delete group</source>
+        <translation>Excluir grupo</translation>
     </message>
     <message>
-        <source>Never</source>
-        <translation>Nunca</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[PROTEGIDO]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>Desabilitado</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Habilitado</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1347,22 +1734,10 @@ Você deseja combinar suas alterações?</translation>
         <translation>Novo atributo</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Confirmar Exclusão</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>Você tem certeza que deseja remover este atributo?</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[PROTEGIDO]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation>Aperte revelar para ver ou editar</translation>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>Amanhã</translation>
     </message>
@@ -1375,10 +1750,6 @@ Você deseja combinar suas alterações?</translation>
         <translation><numerusform>%n mese(s)</numerusform><numerusform>%n mese(s)</numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 ano</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation>Utilizar senha gerada?</translation>
     </message>
@@ -1390,6 +1761,26 @@ Você deseja combinar suas alterações?</translation>
         <source>Entry updated successfully.</source>
         <translation>Item atualizado com sucesso.</translation>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation>Novo atributo %1</translation>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n ano</numerusform><numerusform>%n anos</numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1635,6 +2026,81 @@ Você deseja combinar suas alterações?</translation>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulário</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Senha:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1692,11 +2158,6 @@ Você deseja combinar suas alterações?</translation>
         <translation>Não foi possível obter favicon.</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Dica: Você pode ativar o Google como um recurso em 
-Ferramentas&gt;Configurações&gt;Segurança</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>Imagens</translation>
     </message>
@@ -1705,14 +2166,6 @@ Ferramentas&gt;Configurações&gt;Segurança</translation>
         <translation>Todos arquivos</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Selecionar imagem</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read icon</source>
-        <translation>Não foi possível ler ícone</translation>
-    </message>
-    <message>
         <source>Custom icon already exists</source>
         <translation>Ícone personalizado já existe</translation>
     </message>
@@ -1721,8 +2174,36 @@ Ferramentas&gt;Configurações&gt;Segurança</translation>
         <translation>Confirmar Exclusão</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>Este ícone é usado por %1 entradas, e será substituido pelo ícone padrão. Você tem certeza que deseja apaga-lo?</translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation>Selecionar Imagem(ns)</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation>Nenhum ícone foi carregado</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1773,9 +2254,8 @@ Isto pode causar mal funcionamento dos plugins afetados.</translation>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation> - Clone</translation>
+        <source>%1 - Clone</source>
+        <translation>%1 - Clone</translation>
     </message>
 </context>
 <context>
@@ -1820,10 +2300,6 @@ Isto pode causar mal funcionamento dos plugins afetados.</translation>
         <translation><numerusform>Tem certeza que deseja remover anexos de %n?</numerusform><numerusform>Tem certeza que deseja remover os %n anexo(s)?</numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Confirmar Exclusão</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>Salvar anexos</translation>
     </message>
@@ -1860,10 +2336,13 @@ Isto pode causar mal funcionamento dos plugins afetados.</translation>
 %1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>Impossibilitado de abrir arquivos:
-%1</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1947,6 +2426,106 @@ Isto pode causar mal funcionamento dos plugins afetados.</translation>
         <source>Attachments</source>
         <translation>Anexos</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>Sim</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>Gerar Token TOTP</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Fechar</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Geral</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Nome de usuário</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Senha</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Expiração</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>Atributos</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Anexos</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notas</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Auto-Digitação</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Janela</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Sequência</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Busca</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Pesquisar</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Limpar</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Nunca</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[PROTEGIDO]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Habilitado</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Desabilitado</translation>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EntryView</name>
@@ -1985,6 +2564,19 @@ Isto pode causar mal funcionamento dos plugins afetados.</translation>
         <source>Recycle Bin</source>
         <translation>Lixeira</translation>
     </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>HostInstaller</name>
@@ -1998,61 +2590,6 @@ Isto pode causar mal funcionamento dos plugins afetados.</translation>
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>Comprimento:</translation>
-    </message>
-    <message>
-        <source>Character Types</source>
-        <translation>Tipo de Caracteres</translation>
-    </message>
-    <message>
-        <source>Upper Case Letters</source>
-        <translation>Letras Maiúsculas</translation>
-    </message>
-    <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
-    </message>
-    <message>
-        <source>Lower Case Letters</source>
-        <translation>Letras Minúsculas</translation>
-    </message>
-    <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
-    </message>
-    <message>
-        <source>Numbers</source>
-        <translation>Números</translation>
-    </message>
-    <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
-    </message>
-    <message>
-        <source>Special Characters</source>
-        <translation>Caracteres Especiais</translation>
-    </message>
-    <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
-    </message>
-    <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Excluir caracteres semelhantes</translation>
-    </message>
-    <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>Verificar se a senha contém caracteres de todos os grupos</translation>
-    </message>
-    <message>
-        <source>Extended ASCII</source>
-        <translation>ASCII extendido</translation>
-    </message>
-</context>
-<context>
     <name>KMessageWidget</name>
     <message>
         <source>&amp;Close</source>
@@ -2077,6 +2614,26 @@ Isto pode causar mal funcionamento dos plugins afetados.</translation>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Chave errada ou base de dados corrompida.</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation>cabeçalhos de banco de dados ausente</translation>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>Tamanho do id do cabeçalho inválido</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>Comprimento do campo de cabeçalho inválido</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>Comprimento de dados cabeçalho inválido</translation>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2236,10 +2793,6 @@ Isto pode causar mal funcionamento dos plugins afetados.</translation>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation>Comprimento de uuid cifra inválido</translation>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation>Cifra não suportada</translation>
     </message>
@@ -2293,6 +2846,18 @@ Isto é uma migração de caminho único. Você não poderá abrir o banco de da
         <source>Unsupported KeePass 2 database version.</source>
         <translation>Versão do banco de dados KeePass 2 não suportada.</translation>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2365,10 +2930,6 @@ Isto é uma migração de caminho único. Você não poderá abrir o banco de da
         <translation>Elemento de história com diferente uuid</translation>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation>Não é possível descriptografar a sequência de caracteres de entrada</translation>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation>Atributo customizado duplicado encontrado</translation>
     </message>
@@ -2417,6 +2978,12 @@ Isto é uma migração de caminho único. Você não poderá abrir o banco de da
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation>Não é possível descompactar binário</translation>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2580,28 +3147,126 @@ Isto é uma migração de caminho único. Você não poderá abrir o banco de da
         <source>Invalid entry field type</source>
         <translation>Tipo de campo de entrada inválido</translation>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>O arquivo cadeado de instância única existente é inválido. Iniciando nova instância.</translation>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>O arquivo cadeado não pode ser criado. Modo de instância única desabilitado.</translation>
+        <source>Import from</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Outra instância do KeePassXC já está rodando.</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Erro fatal enquanto testava as funções criptográficas.</translation>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Erro</translation>
+        <source>Key Component</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation>Adicionar %1</translation>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation>Mudar %1</translation>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation>Remover %1</translation>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>Navegar</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Gerar</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation>Formato de 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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Arquivos-chave</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Todos arquivos</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Criar Arquivo-Chave...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Escolha um arquivo-chave</translation>
     </message>
 </context>
 <context>
@@ -2615,10 +3280,6 @@ Isto é uma migração de caminho único. Você não poderá abrir o banco de da
         <translation>&amp;Bancos de dados recentes</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Importar</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation>&amp;Ajuda</translation>
     </message>
@@ -2627,14 +3288,6 @@ Isto é uma migração de caminho único. Você não poderá abrir o banco de da
         <translation>E&amp;ntradas</translation>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>Copiar at&amp;ributo para área de transferência</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation>Senha única baseada em tempo</translation>
-    </message>
-    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Grupos</translation>
     </message>
@@ -2663,30 +3316,10 @@ Isto é uma migração de caminho único. Você não poderá abrir o banco de da
         <translation>&amp;Fechar base de dados</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>&amp;Nova base de dados</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>Juntar base de dados a partir de KeePassX</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>&amp;Adicionar nova entrada</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>&amp;Ver/Editar entrada</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>&amp;Apagar entrada</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>&amp;Adicionar novo grupo</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>&amp;Editar grupo</translation>
     </message>
@@ -2699,14 +3332,6 @@ Isto é uma migração de caminho único. Você não poderá abrir o banco de da
         <translation>Sal&amp;var banco de dados como...</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Alterar chave &amp;mestra...</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>&amp;Definições da base de dados</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>Configurações do Banco de Dados</translation>
     </message>
@@ -2715,10 +3340,6 @@ Isto é uma migração de caminho único. Você não poderá abrir o banco de da
         <translation>&amp;Clonar entrada</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>&amp;Encontrar</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>Copiar nome de &amp;usuário</translation>
     </message>
@@ -2727,10 +3348,6 @@ Isto é uma migração de caminho único. Você não poderá abrir o banco de da
         <translation>Copiar nome de usuário para área de transferência</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>Cop&amp;iar senha</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>Copiar senha para área de transferência</translation>
     </message>
@@ -2743,14 +3360,6 @@ Isto é uma migração de caminho único. Você não poderá abrir o banco de da
         <translation>Gerador de Senha</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation>&amp;Executar escrita automática</translation>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>&amp;Abrir URL</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>&amp;Trancar base de dados</translation>
     </message>
@@ -2783,22 +3392,6 @@ Isto é uma migração de caminho único. Você não poderá abrir o banco de da
         <translation>&amp;Exportar para arquivo CSV...</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Importar banco de dados KeePass1...</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>Importar arquivo CSV...</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Re&amp;parar banco de dados...</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>Mostrar TOTP</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>Configurar TOTP...</translation>
     </message>
@@ -2819,14 +3412,6 @@ Isto é uma migração de caminho único. Você não poderá abrir o banco de da
         <translation>Erro de acesso para o arquivo de configuração %1</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Parece que você está usando KeePassHTTP para integração do navegador. Esse recurso é obsoleto e será removido no futuro. &lt;br&gt;Por favor mudar para KeePassXC-Browser! Para obter ajuda com a migração, visite o nosso &lt;a class=&quot;link&quot; href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt; guia de migração&lt;/a&gt; (aviso %1 de 3).&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>somente leitura</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
@@ -2839,36 +3424,277 @@ Isto é uma migração de caminho único. Você não poderá abrir o banco de da
         <translation>Fechar KeePassXC</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Banco de dados Keepass 2</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Por favor pressione o botão em seu YubiKey!</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Todos arquivos</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation>AVISO: você está usando uma compilação instável do KeePassXC!
+Existe um alto risco de corrupção, mantenha um backup de seus bancos de dados.
+Esta versão não se destina ao uso em produção.</translation>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Abrir banco de dados</translation>
+        <source>&amp;Donate</source>
+        <translation>&amp;Doar</translation>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Salvar banco de dados reparado</translation>
+        <source>Report a &amp;bug</source>
+        <translation>Relatar um &amp;bug</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Escrita do banco de dados falhou.</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Por favor pressione o botão em seu YubiKey!</translation>
+        <source>&amp;Import</source>
+        <translation>&amp;Importar</translation>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
-        <translation>AVISO: você está usando uma compilação instável do KeePassXC!
-Existe um alto risco de corrupção, mantenha um backup de seus bancos de dados.
-Esta versão não se destina ao uso em produção.</translation>
+        <source>Copy att&amp;ribute...</source>
+        <translation>Copiar at&amp;ributo...</translation>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation>TOTP...</translation>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation>&amp;Novo banco de dados...</translation>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation>&amp;Nova entrada</translation>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation>Adicionar uma nova entrada</translation>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation>&amp;Editar entrada</translation>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation>Exibir ou editar entrada</translation>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation>&amp;Novo Grupo</translation>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation>Adicionar a um novo grupo</translation>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation>Abrir &amp;URL</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation>Arquivo CSV...</translation>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation>Importar arquivo CSV</translation>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation>Mostrar TOTP...</translation>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation>Criando %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation>Realocando %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation>Substituindo %1 [%2]</translation>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Raíz</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>Assistente</translation>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation>Definições de &amp;cifra</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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Definições avançadas</translation>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation>Definições básicas</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <translation>Definições de cifra</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 type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2971,125 +3797,34 @@ Esta versão não se destina ao uso em produção.</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>Dialog</source>
-        <translation>Diálogo</translation>
-    </message>
-    <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>Isso é necessário para acessar seus bancos de dados com o ChomeIPass ou PassIFox</translation>
-    </message>
-    <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>Habilitar servidor KeePassHTTP</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Geral</translation>
-    </message>
-    <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>M&amp;ostrar uma notificação quando as credenciais forem solicitadas</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>
-    </message>
-    <message>
-        <source>&amp;Return only best matching entries</source>
-        <translation>&amp;Retorna apenas as melhores entradas encontradas</translation>
-    </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>
-    </message>
-    <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation>Apenas entradas com o mesmo esquema (http://, https://, ftp://, ...) são retornadas.</translation>
-    </message>
-    <message>
-        <source>&amp;Match URL schemes</source>
-        <translation>&amp;Combinar esquemas de URL</translation>
-    </message>
-    <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Ordenar entradas coincidentes por nome de &amp;usuário</translation>
-    </message>
-    <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Ordenar &amp;entradas por título</translation>
-    </message>
-    <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>R&amp;emover todas as chaves criptografadas compartilhadas da base de dados ativa</translation>
-    </message>
-    <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>R&amp;emover todas as permissões armazenadas de entradas na base de dados ativa</translation>
-    </message>
-    <message>
-        <source>Password Generator</source>
-        <translation>Gerador de Senha</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Avançado</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Permitir sempre &amp;acesso as entradas</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Permitir sempre &amp;atualizar as entradas</translation>
-    </message>
-    <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>Somente o banco de dados selecionado deve estar conectado com um cliente.</translation>
-    </message>
-    <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Procurar em todas as base de dados abertas por entradas semel&amp;hantes</translation>
-    </message>
-    <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>Criação automática ou atualizações não são suportadas para os valores dos campos.</translation>
-    </message>
-    <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>&amp;Mostrar também campos avançados que começam com &quot;KPH: &quot;</translation>
-    </message>
-    <message>
-        <source>HTTP Port:</source>
-        <translation>Porta HTTP:</translation>
+        <source>Enter password:</source>
+        <translation>Insira senha:</translation>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Porta padrão: 19455</translation>
+        <source>Confirm password:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC irá escutar esta porta em 127.0.0.1</translation>
+        <source>Password</source>
+        <translation>Senha</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;AVISO:&lt;/b&gt; As seguintes opções podem ser perigosas!</translation>
+        <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"/>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;KeePassHTTP é obsoleto e será removido no futuro. &lt;br&gt;Por favor mudar para KeePassXC-navegador! Para obter ajuda com a migração, visite o nosso &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt; guia de migração&lt;/a&gt;.&lt;/p&gt;</translation>
+        <source>Password cannot be empty.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Não é possível ligar a portas privilegiadas</translation>
+        <source>Passwords do not match.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Não é possível ligar a portas privilegiadas abaixo de 1024!
-Usando porta padrão 19455.</translation>
+        <source>Generate master password</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3160,18 +3895,10 @@ Usando porta padrão 19455.</translation>
         <translation>Lista de palavras:</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Número de Palavras:</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>Separador de Palavras:</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>Gerar</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
@@ -3184,10 +3911,6 @@ Usando porta padrão 19455.</translation>
         <translation>Fechar</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>Aplicar</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>Entropia: %1 bit</translation>
     </message>
@@ -3215,6 +3938,171 @@ Usando porta padrão 19455.</translation>
         <comment>Password quality</comment>
         <translation>Excelente</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Avançado</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation>{[(</translation>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation>Pontuação</translation>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation>.,:;</translation>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation>Aspas</translation>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation>&quot; &apos;</translation>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation>Matemática</translation>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation>&lt;*+!?=</translation>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation>\_|-/</translation>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation>Logo-gramas</translation>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation>#$%&amp;&amp;@^`~</translation>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation>Básico</translation>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation>Não incluir:</translation>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation>Hex</translation>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation>&amp;Número de palavras:</translation>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Excluir</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Remover</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Desabilitar</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3235,34 +4123,18 @@ Usando porta padrão 19455.</translation>
         <translation>Não é possível descriptografar a mensagem</translation>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
-        <translation>Tempo limite ou não pode conectar ao KeePassXC</translation>
-    </message>
-    <message>
         <source>Action cancelled or denied</source>
         <translation>Ação cancelada ou negada</translation>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation>Não foi possível criptografar a mensagem ou chave pública não encontrada. O envio de mensagem nativo está habilitado no KeePassXC?</translation>
-    </message>
-    <message>
         <source>KeePassXC association failed, try again</source>
         <translation>KeePassXC associação falhou, tente novamente</translation>
     </message>
     <message>
-        <source>Key change was not successful</source>
-        <translation>Mudança da chave não foi bem sucedida</translation>
-    </message>
-    <message>
         <source>Encryption key is not recognized</source>
         <translation>Chave criptográfica não é reconhecida</translation>
     </message>
     <message>
-        <source>No saved databases found</source>
-        <translation>Nenhum banco de dados salvo encontrado</translation>
-    </message>
-    <message>
         <source>Incorrect action</source>
         <translation>Ação incorreta</translation>
     </message>
@@ -3388,10 +4260,6 @@ Usando porta padrão 19455.</translation>
         <translation>Inserir a senha para desbloquear 1%: </translation>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation>Falha ao carregar o arquivo de chave %1: %2</translation>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3475,12 +4343,6 @@ Comandos disponíveis:
         <translation>erro ao ler dispositivo</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>Arquivo vazio!
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation>sequência de caracteres malformada</translation>
     </message>
@@ -3489,30 +4351,6 @@ Comandos disponíveis:
         <translation>apóstrofo de fechamento ausente</translation>
     </message>
     <message>
-        <source>AES: 256-bit</source>
-        <translation>AES: 256 bits</translation>
-    </message>
-    <message>
-        <source>Twofish: 256-bit</source>
-        <translation>Twofish: 256 bits</translation>
-    </message>
-    <message>
-        <source>ChaCha20: 256-bit</source>
-        <translation>ChaCha20: 256 bits</translation>
-    </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – recomendado)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 4)</source>
-        <translation>AES-KDF (KDBX 4)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 3.1)</source>
-        <translation>AES-KDF (KDBX 3.1)</translation>
-    </message>
-    <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
@@ -3541,10 +4379,6 @@ Comandos disponíveis:
         <translation>Criado</translation>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
-        <translation>Integração do legado de navegador</translation>
-    </message>
-    <message>
         <source>Browser Integration</source>
         <translation>Integração com o Navegador</translation>
     </message>
@@ -3573,10 +4407,6 @@ Comandos disponíveis:
         <translation>Contagem de palavra para a frase-chave diceware.</translation>
     </message>
     <message>
-        <source>count</source>
-        <translation>contagem</translation>
-    </message>
-    <message>
         <source>Wordlist for the diceware generator.
 [Default: EFF English]</source>
         <translation>Lista de palavras para o gerador diceware.
@@ -3587,28 +4417,438 @@ Comandos disponíveis:
         <translation>Gerar nova senha aleatória.</translation>
     </message>
     <message>
-        <source>Length of the generated password.</source>
-        <translation>Tamanho da senha gerada.</translation>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation>contagem</translation>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation>Tamanho %1</translation>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation>Entropia %1</translation>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation>Log10 %1</translation>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
-        <translation>Use caracteres minúsculos na senha gerada.</translation>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
-        <translation>Use letras maiúsculas para a senha gerada.</translation>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
-        <translation>Use números na senha gerada.</translation>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
-        <translation>Use caracteres especiais na senha gerada.</translation>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
-        <translation>Uso estendido ASCII na senha gerada.</translation>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256 bits</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256 bits</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256 bits</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – recomendado)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>Remover entrada do banco de dados.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>Caminho para remover entrada.</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>O arquivo cadeado de instância única existente é inválido. Iniciando nova instância.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>O arquivo cadeado não pode ser criado. Modo de instância única desabilitado.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - gerenciador de senhas multiplataforma</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>nome de arquivo do banco de dados de senhas a ser aberto (*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>caminho para um arquivo de configuração personalizado</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>arquivo-chave do banco de dados</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>ler a senha do banco de dados da entrada padrão</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation>Identificador de janela pai</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Outra instância do KeePassXC já está rodando.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Erro fatal enquanto testava as funções criptográficas.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Erro</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation>Senha do banco de dados:</translation>
     </message>
 </context>
 <context>
@@ -3646,12 +4886,98 @@ Comandos disponíveis:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
+    <message>
+        <source>Agent connection failed.</source>
+        <translation>Falha na conexão do agente.</translation>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation>Erro de protocolo do agente</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation>Nenhum agente em execução, não é possível remover a identidade.</translation>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation>Agente recusou essa identidade. Possíveis razões incluem:</translation>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation>O atalho já foi adicionado.</translation>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation>Campos</translation>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <source>Search...</source>
-        <translation>Buscar...</translation>
+        <source>match anything</source>
+        <translation type="unfinished"/>
     </message>
     <message>
+        <source>match one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation>Exemplos</translation>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
         <source>Search</source>
         <translation>Pesquisar</translation>
     </message>
@@ -3660,314 +4986,316 @@ Comandos disponíveis:
         <translation>Limpar</translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Diferenciar maiúsculas e minúsculas</translation>
-    </message>
-    <message>
         <source>Limit search to selected group</source>
         <translation>Limitar busca ao grupo selecionado</translation>
     </message>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation>Diferenciar maiúsculas e minúsculas</translation>
+    </message>
 </context>
 <context>
-    <name>Service</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC: Nova associação de chaves requisitada</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation>Recebeu uma solicitação de associação para a chave acima.
-Se quiser permitir o acesso a sua base de dados KeePassXC
-dar-lhe um nome único para identificá-lo e aceitá-lo.</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: Substituir chave existente?</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Já existe uma chave de criptografia compartilhada com o nome &quot;%1&quot;.
-Deseja substituí-la?</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: Atualizar entrada</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Deseja atualizar as informações em %1 - %2?</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Banco de dados bloqueado!</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>A base de dados ativa está bloqueada!
-Desbloqueie base de dados selecionada ou escolha outra que esteja desbloqueada.</translation>
+        <source>Key:</source>
+        <translation>Chave:</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Chaves removidas do banco de dados</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation><numerusform>Removido com êxito a criptografia de %n-chave (s) de configurações KeePassX/Http.</numerusform><numerusform>Removido com êxito %n a(s) chave(s) criptografia(s) das configurações KeePassX/Http.</numerusform></translation>
+        <source>Generate</source>
+        <translation>Gerar</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Nenhuma chave localizada</translation>
+        <source>Import</source>
+        <translation>Importar</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>Nenhuma chave de criptografia compartilhada encontrada nas Configurações do KeePassHttp.</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Configurações não disponíveis!</translation>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>A base de dados ativa não contém uma entrada de Configurações KeePassHttp.</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>Removendo permissões armazenadas...</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>Cancelar</translation>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Permissões removidas</translation>
+        <source>Remove</source>
+        <translation>Remover</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation><numerusform>Removido com êxito as permissões de %n entradas.</numerusform><numerusform>Removido com êxito as permissões das %n entradas.</numerusform></translation>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Nenhuma entrada com permissões localizada!</translation>
+        <source>Status</source>
+        <translation type="unfinished"/>
     </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>
+        <source>Fingerprint</source>
+        <translation>Fingerprint</translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
-        <translation>Configurações do Aplicativo</translation>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Geral</translation>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>Segurança</translation>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>Erro de acesso para o arquivo de configuração %1</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>Configurações Básicas</translation>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Iniciar apenas uma única instância do KeePassXC</translation>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>Lembrar dos últimos bancos de dados</translation>
+        <source>All files</source>
+        <translation>Todos arquivos</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Lembre-se de arquivos de chave passados e dongles de segurança</translation>
+        <source>Select path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Carregar bancos de dados anteriores na inicialização</translation>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>Salvar automaticamente ao sair</translation>
+        <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"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>Salvar automaticamente depois de cada alteração</translation>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Automaticamente recarregar o banco de dados quando houver modificações externas</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>Minimizar ao copiar para área de transferência</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Iniciar programa com janela minimizada</translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>Usar ícone de grupo na criação da entrada</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Não marcar o banco de dados como modificado para alterações sem dados (por exemplo, expansão de grupos)</translation>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
-        <translation>Ocultar a visualização de detalhes</translation>
+        <source>Never</source>
+        <translation>Nunca</translation>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>Mostrar um ícone da bandeja do sistema</translation>
+        <source>Always</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>Ocultar janela na bandeja de sistema quando minimizada</translation>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
-        <translation>Ocultar janela na bandeja de sistema em vez de sair do programa</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
-        <translation>Ícone de bandeja do sistema escuro</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Idioma</translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Auto-Digitação</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>Usar o título de entrada para coincidir com a janela para Auto-Digitar global</translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>Use o URL de entrada para coincidir com a janela para Auto-Digitar global</translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation>Sempre perguntar antes de executar o Auto-Digitar</translation>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Atalho para Auto-Digitação Global</translation>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>Atraso de autotipo</translation>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation>ms</translation>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
-        <translation>Inicialização</translation>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
-        <translation>Gerenciamento de Arquivo</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
     </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>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
-        <translation>Fazer cópia de segurança do banco de dados antes de salvar</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
-        <translation>Gerenciamento de entrada</translation>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Geral</translation>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
-        <translation>Tempos limite</translation>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>Limpar área de transferência após</translation>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> seg</translation>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>Travar bancos de dados após inatividade de</translation>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Conveniência</translation>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </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>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>Bloquear bancos de dados após minimizar a janela</translation>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>TotpDialog</name>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>Quando a senha for visível não pedir para repeti-la</translation>
+        <source>Timed Password</source>
+        <translation>Senha Temporária</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Mostrar senhas em texto claro por padrão</translation>
+        <source>000000</source>
+        <translation>000000</translation>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
-        <translation>Ocultar senhas no painel de visualização</translation>
+        <source>Copy</source>
+        <translation>Copiar</translation>
     </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
     <message>
-        <source>Hide entry notes by default</source>
-        <translation>Esconder notas de entrada por padrão</translation>
+        <source>Copy</source>
+        <translation>Copiar</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>Privacidade</translation>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>Usar o Google como fallback para baixar ícones do site</translation>
+        <source>There was an error creating the QR code.</source>
+        <translation type="unfinished"/>
     </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>
+        <source>Closing in %1 seconds.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation>Configurar TOTP</translation>
@@ -3989,59 +5317,84 @@ Desbloqueie base de dados selecionada ou escolha outra que esteja desbloqueada.<
         <translation>Usar configurações personalizadas</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>Nota: Altere estas configurações apenas se souber o que está fazendo.</translation>
+        <source>Custom Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Time step:</source>
         <translation>Período de tempo:</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8 dígitos</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> seg</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>Tamanho do código:</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6 dígitos</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>Tamanho do código:</translation>
+        <source>7 digits</source>
+        <translation>7 dígitos</translation>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> seg</translation>
+        <source>8 digits</source>
+        <translation>8 dígitos</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>Senha Temporária</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Copiar</translation>
+        <source>Close</source>
+        <translation>Fechar</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>Expira em</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>segundos</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>Destrancar banco de dados</translation>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4076,42 +5429,26 @@ Desbloqueie base de dados selecionada ou escolha outra que esteja desbloqueada.<
     </message>
 </context>
 <context>
-    <name>main</name>
-    <message>
-        <source>Remove an entry from the database.</source>
-        <translation>Remover item da base de dados</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>Caminho do banco de dados</translation>
-    </message>
-    <message>
-        <source>Path of the entry to remove.</source>
-        <translation>Caminho para remover entrada.</translation>
-    </message>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - gerenciador de senhas multiplataforma</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>nome de arquivo do banco de dados de senhas a ser aberto (*.kdbx)</translation>
+        <source>Refresh</source>
+        <translation>Atualizar</translation>
     </message>
     <message>
-        <source>path to a custom config file</source>
-        <translation>caminho para um arquivo de configuração personalizado</translation>
+        <source>YubiKey Challenge-Response</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>arquivo-chave do banco de dados</translation>
+        <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"/>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>ler a senha do banco de dados da entrada padrão</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Parent window handle</source>
-        <translation>Identificador de janela pai</translation>
+        <source>No YubiKey inserted.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_pt_PT.ts b/share/translations/keepassx_pt_PT.ts
index 9382ad941..3bfa54825 100644
--- a/share/translations/keepassx_pt_PT.ts
+++ b/share/translations/keepassx_pt_PT.ts
@@ -38,12 +38,6 @@
         <translation>Copiar para a área de transferência</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>Versão %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>Revisão: %1</translation>
     </message>
@@ -76,35 +70,48 @@ Kernel: %3 %4</translation>
         <translation>Um agradecimento especial da equipa do KeePassXC a debfx por ter criado a aplicação KeePassX.</translation>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
-        <translation>Tipo de compilação: %1
-</translation>
+        <source>Version %1</source>
+        <translation>Versão %1</translation>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP - Confirmar acesso</translation>
+        <source>Build Type: %1</source>
+        <translation>Tipo de compilação: %1</translation>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>Memorizar esta escolha</translation>
+        <source>Auto-Type</source>
+        <translation>Escrita automática</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Permitir</translation>
+        <source>Browser Integration</source>
+        <translation>Integração com o navegador</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>Recusar</translation>
+        <source>SSH Agent</source>
+        <translation>Agente SSH</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>%1 solicitou o acesso a palavras-passe para o(s) seguinte(s) iten(s).
-Selecione se deseja permitir o acesso.</translation>
+        <source>YubiKey</source>
+        <translation>YubiKey</translation>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation>TouchID</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Nada</translation>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -113,16 +120,287 @@ Selecione se deseja permitir o acesso.</translation>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>Ativar agente SSH (tem que reiniciar)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Definições da aplicação</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Geral</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Segurança</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Erro de acesso ao ficheiro %1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Definições básicas</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>Arranque</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Abrir apenas uma instância do KeepassXC</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Memorizar as últimas bases de dados</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Memorizar últimos ficheiros-chave e dispositivos de segurança</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Ao iniciar, carregar as últimas base de dados utilizadas</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>Minimizar janela ao iniciar a aplicação</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>Gestão de ficheiros</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation>Guardar bases de dados em segurança (pode ser incompatível com DropBox e outros serviços)</translation>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation>Criar cópia de segurança da base de dados antes de guardar</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Guardar automaticamente a cada alteração</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Guardar automaticamente ao fechar</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Não marcar base de dados como alterada para modificações não efetuadas em dados (ex.: expansão de grupos)</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Recarregar base de dados se esta for modificada externamente</translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>Gestão de entradas</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>Utilizar ícone do grupo ao criar a entrada</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Minimizar ao copiar para a área de transferência</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation>Ocultar painel de pré-visualização de entradas</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Geral</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation>Ocultar barra de ferramentas (ícones)</translation>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation>Minimizar aplicação em vez de fechar</translation>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Mostrar ícone na bandeja do sistema</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>Ícone escuro na bandeja</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Ao minimizar, ocultar a janela na bandeja do sistema</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Idioma</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Escrita automática</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>Utilizar título da entrada para fazer coincidir com a escrita automática</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>Utilizar URL da entrada para fazer coincidir com a escrita automática</translation>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>Perguntar antes de executar a escrita automática</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Atalho global para escrita automática</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation>Atraso para escrita automática</translation>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation> ms</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation>Atraso para iniciar a escrita automática</translation>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>Tempo limite</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>Limpar área de transferência após</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> seg</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>Bloquear base de dados se inativa durante</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation> min</translation>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation>Esquecer TouchID após inatividade de</translation>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>Conveniência</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Bloquear base de dados ao bloquear a sessão ou ao fechar a tampa do portátil</translation>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation>Esquecer TouchID ao bloquear a sessão ou ao fechar a tampa do portátil</translation>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>Bloquear base de dados ao minimizar a janela</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation>Bloquear novamente a base de dados depois de usar a escrita automática</translation>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>Não pedir repetição da palavra-passe se esta estiver visível</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation>Não ocultar palavras-passe durante a edição</translation>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation>Não utilizar marcadores de posição para campos vazios</translation>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation>Ocultar palavras-passe no painel de pré-visualização de entradas</translation>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>Por definição, ocultar notas da entrada</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>Privacidade</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation>Utilizar DuckDuckGo como recurso para descarregar os ícones dos sites</translation>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
     <message>
         <source>Couldn&apos;t find an entry that matches the window title:</source>
-        <translation>Não foi possível encontrar uma entrada coincidente com o título da janela:</translation>
+        <translation>Não foi encontrada uma entrada coincidente com o título da janela:</translation>
     </message>
     <message>
         <source>Auto-Type - KeePassXC</source>
-        <translation>Escrita automática - KeePassXC</translation>
+        <translation>KeePassXC - Escrita automática</translation>
     </message>
     <message>
         <source>Auto-Type</source>
@@ -138,7 +416,7 @@ Selecione se deseja permitir o acesso.</translation>
     </message>
     <message>
         <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
-        <translation>O comando de escrita automática tem uma pressão de teclas muito lento. Deseja mesmo continuar?</translation>
+        <translation>O comando de escrita automática tem uma pressão de teclas muito lenta. Deseja mesmo continuar?</translation>
     </message>
     <message>
         <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
@@ -183,7 +461,7 @@ Selecione se deseja permitir o acesso.</translation>
     <name>AutoTypeSelectDialog</name>
     <message>
         <source>Auto-Type - KeePassXC</source>
-        <translation>Escrita automática - KeePassXC</translation>
+        <translation>KeePassXC - Escrita automática</translation>
     </message>
     <message>
         <source>Select entry to Auto-Type:</source>
@@ -194,7 +472,7 @@ Selecione se deseja permitir o acesso.</translation>
     <name>BrowserAccessControlDialog</name>
     <message>
         <source>KeePassXC-Browser Confirm Access</source>
-        <translation>KeePassXC Navegador - Confirmar acesso</translation>
+        <translation>KeePassXC-Browser - Confirmar acesso</translation>
     </message>
     <message>
         <source>Remember this decision</source>
@@ -211,11 +489,32 @@ Selecione se deseja permitir o acesso.</translation>
     <message>
         <source>%1 has requested access to passwords for the following item(s).
 Please select whether you want to allow access.</source>
-        <translation>%1 solicitou o acesso a palavras-passe para o(s) seguinte(s) iten(s).
+        <translation>%1 solicitou o acesso a palavras-passe para o(s) seguinte(s) itens.
 Selecione se deseja permitir o acesso.</translation>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation>KeePassXC-Browser - Guardar entrada</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Aceitar</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation>Existem várias bases de dados abertas.
+Selecione a base de dados correta para guardar as credenciais.</translation>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -223,7 +522,7 @@ Selecione se deseja permitir o acesso.</translation>
     </message>
     <message>
         <source>This is required for accessing your databases with KeePassXC-Browser</source>
-        <translation>Isto é necessário para aceder às suas bases de dados com KeePassXC-Browser</translation>
+        <translation>Necessário para aceder às suas bases de dados com KeePassXC-Browser</translation>
     </message>
     <message>
         <source>Enable KeepassXC browser integration</source>
@@ -281,7 +580,7 @@ Selecione se deseja permitir o acesso.</translation>
     <message>
         <source>Sort &amp;matching credentials by title</source>
         <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>Ordenar &amp;entradas por título</translation>
+        <translation>Ordenar credenciais coi&amp;ncidentes por título</translation>
     </message>
     <message>
         <source>Sort matching credentials by &amp;username</source>
@@ -289,14 +588,6 @@ Selecione se deseja permitir o acesso.</translation>
         <translation>Ordenar credenciais coincidentes por nome de &amp;utilizador</translation>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>&amp;Desconectar de todos os navegadores</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>Esquecer todas as &amp;permissões memorizadas</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>Avançado</translation>
     </message>
@@ -329,11 +620,11 @@ Selecione se deseja permitir o acesso.</translation>
     </message>
     <message>
         <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
-        <translation>Atualiza automaticamente o caminho do KeePassXC ou do caminho do binário keepassxc-proxy para os &apos;sripts&apos; nativos de mensagens ao iniciar.</translation>
+        <translation>Ao iniciar, atualizar automaticamente o caminho do KeePassXC ou do binário keepassxc-proxy para os &apos;sripts&apos; nativos de mensagens.</translation>
     </message>
     <message>
         <source>Update &amp;native messaging manifest files at startup</source>
-        <translation>Atualizar ficheiros de mensagens &amp;nativas ao iniciar</translation>
+        <translation>Ao iniciar, atualizar ficheiros de mensagens &amp;nativas</translation>
     </message>
     <message>
         <source>Support a proxy application between KeePassXC and browser extension.</source>
@@ -355,34 +646,51 @@ Selecione se deseja permitir o acesso.</translation>
     <message>
         <source>Browse...</source>
         <extracomment>Button for opening file dialog</extracomment>
-        <translation>Procurar...</translation>
+        <translation>Explorar...</translation>
     </message>
     <message>
         <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
         <translation>&lt;b&gt;Aviso&lt;/b&gt;: as opções seguintes podem ser perigosas!</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>Ficheiros executáveis (*.exe);;Todos os ficheiros (*.*)</translation>
+        <source>Select custom proxy location</source>
+        <translation>Selecionar localização do proxy personalizado</translation>
     </message>
     <message>
-        <source>Executable Files (*)</source>
-        <translation>Ficheiros executáveis (*)</translation>
+        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
+        <translation>Lamentamos mas, de momento, o KeePassXC-Browser não tem suporte a versões Snap.</translation>
     </message>
     <message>
-        <source>Select custom proxy location</source>
-        <translation>Selecionar localização do proxy personalizado</translation>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation>Necessita de KeePassXC-Browser para que a integração com o navegador funcione. &lt;br /&gt;Descarregue para %1 e para %2.</translation>
     </message>
     <message>
-        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
-        <translation>Lamentamos, mas, no momento, o KeePassXC-Browser não tem suporte a versões Snap.</translation>
+        <source>&amp;Tor Browser</source>
+        <translation>Navegador &amp;Tor</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: </source>
+        <translation>&lt;b&gt;Atenção&lt;/b&gt;, a aplicação keepassxc-proxy não foi encontrada!&lt;br /&gt;Verifique o diretório de instalação do KeePassXC ou confirme o caminho nas definições avançadas.&lt;br /&gt;A integração com o navegador não irá funcionar sem esta aplicação.&lt;br /&gt;Caminho esperado: </translation>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation>Ficheiros executáveis</translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation>Todos os ficheiros</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"/>
     </message>
 </context>
 <context>
     <name>BrowserService</name>
     <message>
         <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC: Pedido de associação de nova chave</translation>
+        <translation>KeePassXC: Pedido de associação da nova chave</translation>
     </message>
     <message>
         <source>You have received an association request for the above key.
@@ -392,7 +700,7 @@ give it a unique name to identify and accept it.</source>
         <translation>Recebeu um pedido de associação para a chave acima indicada.
 
 Se quiser permitir o acesso à sua base de dados do KeePassXC,
-digite um nome identificável e aceite o pedido.</translation>
+introduza um nome identificável e aceite o pedido.</translation>
     </message>
     <message>
         <source>Save and allow access</source>
@@ -417,153 +725,46 @@ Deseja substituir a chave existente?</translation>
         <translation>Deseja atualizar as informações em %1 - %2?</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Base de dados bloqueada!</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>A base de dados ativa está bloqueada!
-Desbloqueie a base de dados selecionada ou escolha outra que esteja desbloqueada.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Definições indisponíveis!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation>A base de dados ativa não contém uma entrada de definições.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Nenhuma chave encontrada</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation>Não foram encontradas chaves de cifra partilhadas nas definições do KeePassXC.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Chaves removidas da base de dados</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation><numerusform>Removidas com sucesso %n chave de cifra das definições do KeePassXC.</numerusform><numerusform>Removidas com sucesso %n chaves de cifra das definições do KeePassXC.</numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>A remover permissões guardadas...</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>Abortar</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Permissões removidas</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation><numerusform>Removidas com sucesso as permissões de %n entrada.</numerusform><numerusform>Removidas com sucesso as permissões de %n entrada(s).</numerusform></translation>
+        <source>Converting attributes to custom data…</source>
+        <translation>A converter atributos para dados personalizados...</translation>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Não existem entradas com permissões!</translation>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation>KeePassXC: Atributos KeePassHTTP convertidos</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>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation>Os atributos para %1 entrada(s) foram convertidos.
+%2 chaves movidas para dados personalizados.</translation>
     </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>Palavra-passe</translation>
-    </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>Introduza a palavra-passe:</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>Repita a palavra-passe:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>Ficheiro-&amp;chave</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>Procurar</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Criar</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>Pergunta de &amp;segurança</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Recarregar</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>Ficheiros-chave</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>Todos os ficheiros</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>Criar ficheiro-chave...</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>Não foi possível criar o ficheiro-chave:</translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>Selecione o ficheiro-chave</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Palavra-passe vazia</translation>
-    </message>
-    <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>Deseja mesmo utilizar uma cadeia vazia como palavra-passe?</translation>
-    </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>As palavras-passe não são iguais.</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation><numerusform>%n chave movida para dados personalizados.</numerusform><numerusform>%n chaves movidas para dados personalizados.</numerusform></translation>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>Falha ao definir %1 como ficheiro-chave:
-%2</translation>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation>KeePassXC: Não existem entradas com atributos KeePassHTTP!</translation>
     </message>
     <message>
-        <source>Legacy key file format</source>
-        <translation>Formato legado de ficheiro-chave</translation>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation>A base de dados ativa não tem entradas com atributos KePassHTTP.</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á a utilizar um formato legado que pode, no futuro, deixar
-de ser suportado.
-
-Deve considerar a geração de uma novo ficheiro-chave.</translation>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation>KeePassXC: Detetadas definições de integração legada com o navegador</translation>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>Falha ao alterar a palavra-passe mestre: Yubikey não inserida.</translation>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation>Detetadas definições de integração legada com o navegador.
+Deseja atualizar as definições para a versão mais recente?
+Esta atualização é necessária para manter a compatibilidade com o suplemento.</translation>
     </message>
 </context>
 <context>
@@ -644,64 +845,93 @@ Deve considerar a geração de uma novo ficheiro-chave.</translation>
         <translation>Não existente no ficheiro CSV</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>Nome de campo vazio</translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>coluna</translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>Importar de ficheiro CSV</translation>
     </message>
     <message>
         <source>Original data: </source>
-        <translation>Dados originais:</translation>
+        <translation>Dados originais: </translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>Detetado(s) erro(s) no ficheiro CSV!</translation>
+        <source>Error</source>
+        <translation>Erro</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation>mais mensagens ignoradas]</translation>
+        <source>Empty fieldname %1</source>
+        <translation>Nome de campo vazio %1</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Erro</translation>
+        <source>column %1</source>
+        <translation>coluna %1</translation>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>Importação CSV: com erros:
-</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation>Detetado(s) erro(s) no ficheiro CSV!</translation>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>Erro</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation><numerusform>[%n mensagem ignorada]</numerusform><numerusform>[%n mensagens ignoradas]</numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Não foi possível calcular a chave-mestre</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation>Importação CSV com erros:
+%1</translation>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
-        <translation><numerusform>%n byte,</numerusform><numerusform>%n byte(s), </numerusform></translation>
+        <source>%n column(s)</source>
+        <translation><numerusform>%n coluna,</numerusform><numerusform>%n coluna(s),</numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation>%1, %2, %3</translation>
     </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
-        <translation><numerusform>%n linha,</numerusform><numerusform>%n linha(s),</numerusform></translation>
+        <source>%n byte(s)</source>
+        <translation><numerusform>%n byte</numerusform><numerusform>%n bytes</numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
-        <translation><numerusform>%n coluna,</numerusform><numerusform>%n coluna(s),</numerusform></translation>
+        <source>%n row(s)</source>
+        <translation><numerusform>%n linha</numerusform><numerusform>%n linhas</numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Raiz</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>%1 não existe.</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Não foi possível abrir o ficheiro %1.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation>Erro ao ler a base de dados: %1</translation>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation>Não é possível guardar porque a base de dados não tem nome.</translation>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation>Não é possível escrever no ficheiro porque este foi aberto no modo de leitura.</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation>KeePassXC - Desbloquear base de dados</translation>
     </message>
 </context>
 <context>
@@ -720,7 +950,7 @@ Deve considerar a geração de uma novo ficheiro-chave.</translation>
     </message>
     <message>
         <source>Browse</source>
-        <translation>Procurar</translation>
+        <translation>Explorar</translation>
     </message>
     <message>
         <source>Refresh</source>
@@ -731,16 +961,8 @@ Deve considerar a geração de uma novo ficheiro-chave.</translation>
         <translation>Pergunta de segurança:</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Não foi possível abrir a base de dados.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Incapaz de abrir o ficheiro-chave</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
-        <translation>Formato legado de ficheiro-chave</translation>
+        <translation>Ficheiro-chave no formato legado</translation>
     </message>
     <message>
         <source>You are using a legacy key file format which may become
@@ -750,7 +972,7 @@ Please consider generating a new key file.</source>
         <translation>Está a utilizar um formato legado que pode, no futuro, deixar
 de ser suportado.
 
-Deve considerar a geração de uma novo ficheiro-chave.</translation>
+Deve considerar a geração de um novo ficheiro-chave.</translation>
     </message>
     <message>
         <source>Don&apos;t show this warning again</source>
@@ -768,105 +990,174 @@ Deve considerar a geração de uma novo ficheiro-chave.</translation>
         <source>Select key file</source>
         <translation>Selecione o ficheiro-chave</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>Reparar base de dados</translation>
+        <source>TouchID for quick unlock</source>
+        <translation>TouchID para desbloqueio rápido</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Erro</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation>Não foi possível abrir a base de dados:
+%1</translation>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Incapaz de abrir o ficheiro-chave</translation>
+        <source>Can't open key file:
+%1</source>
+        <translation>Não foi possível abrir o ficheiro-chave:
+%1</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Não foi possível abrir a base de dados.</translation>
+        <source>Passwords</source>
+        <translation>Palavras-passe</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Definições avançadas</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Geral</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Base de dados aberta. Nada para fazer.</translation>
+        <source>Security</source>
+        <translation>Segurança</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>Sucesso</translation>
+        <source>Master Key</source>
+        <translation>Chave-mestre</translation>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>A base de dados foi reparada com sucesso
-Agora já a pode guardar.</translation>
+        <source>Encryption Settings</source>
+        <translation>Definições de cifra</translation>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>Não foi possível reparar a base de dados.</translation>
+        <source>Browser Integration</source>
+        <translation>Integração com navegador</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>Geral</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation>Definições KeePassXC-Browser</translation>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>Cifra</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>&amp;Desconectar de todos os navegadores</translation>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Número de ciclos muito alto</translation>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation>&amp;Esquecer definições específicas dos sites (nas entradas)</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>Está a utilizar um número muito alto para a transformação de chaves com Argon2.
-
-Se mantiver este número, a sua base de dados pode levar muitas horas/dias (ou ainda mais) para ser aberta!</translation>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation>Mover atributos KeePassHTTP para dados personalizados KeePassX&amp;C-Browser</translation>
     </message>
     <message>
-        <source>Understood, keep number</source>
-        <translation>Percebi, manter número</translation>
+        <source>Stored keys</source>
+        <translation>Chaves guardadas</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
+        <source>Remove</source>
+        <translation>Remover</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Número de ciclos muito baixo</translation>
+        <source>Delete the selected key?</source>
+        <translation>Apagar chave selecionada?</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>Está a utilizar um número muito baixo para a transformação de chaves com Argon2.
-
-Se mantiver este número, a sua base de dados pode ser desbloqueada muito facilmente!</translation>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation>Tem a certeza de que deseja apagar a chave selecionada?
+Esta ação pode impedir a ligação ao suplemento.</translation>
     </message>
     <message>
-        <source>KDF unchanged</source>
-        <translation>KDF inalterado</translation>
+        <source>Key</source>
+        <translation>Chave</translation>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
-        <translation>Falha ao transformar a chave com os novos parâmetros KDF; KDF inalterado.</translation>
+        <source>Value</source>
+        <translation>Valor</translation>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation>Ative a integração com o navegador para aceder a estas definições.</translation>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation>Desconectar de todos os navegadores</translation>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation>Tem a certeza de que deseja desconectar todos os navegadores?
+Esta ação pode interferir com a ligação ao suplemento.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Nenhuma chave encontrada</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation>Não foram encontradas chaves de cifra nas definições do KeePassXC.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Chaves removidas da base de dados</translation>
     </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
-        <translation><numerusform> MiB</numerusform><numerusform> MiB</numerusform></translation>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation><numerusform>Removida com sucesso %n chave de cifra das definições do KeePassXC.</numerusform><numerusform>Removidas com sucesso %n chaves de cifra das definições do KeePassXC.</numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation>Esquecer definições específicas dos sites (nas 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>Tem a certeza de que deseja esquecer as definições específicas de todas as entradas?
+Serão removidas todas as permissões para aceder às entradas.</translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>A remover permissões guardadas...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Abortar</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Permissões removidas</translation>
     </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
-        <translation><numerusform>processo</numerusform><numerusform>processos</numerusform></translation>
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation><numerusform>Removidas com sucesso as permissões de %n entrada.</numerusform><numerusform>Removidas com sucesso as permissões de %n entradas.</numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: Não existem entradas com permissões!</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>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation>Mover atributos KeePassHTTP para dados personalizados</translation>
+    </message>
+    <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>Tem a certeza de que deseja atualizar todos os dados legados para a versão mais recente?
+Esta atualização é necessária para manter a compatibilidade com o suplemento.</translation>
     </message>
 </context>
 <context>
@@ -903,6 +1194,113 @@ Se mantiver este número, a sua base de dados pode ser desbloqueada muito facilm
         <source>Parallelism:</source>
         <translation>Paralelismo:</translation>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation>Tempo para decifrar:</translation>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation>?? s</translation>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation>Alterar</translation>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation>100 ms</translation>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation>5 s</translation>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation>Os valores mais altos oferecem mais proteção mas também pode demorar mais tempo para abrir a base de dados.</translation>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation>Formato da base de dados:</translation>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation>Apenas relevante se necessitar de utilizar a base de dados com outros programas.</translation>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation>KDBX 4.0 (recomendado)</translation>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation>KDBX 3.1</translation>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation>inalterado</translation>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Número de ciclos 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>Está a utilizar um número muito alto para a transformação de chaves com Argon2.
+
+Se mantiver este número, a sua base de dados pode levar muitas horas/dias (ou ainda mais) para ser aberta!</translation>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation>Percebi, manter número</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Número de ciclos muito baixo</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>Está a utilizar um número muito baixo para a transformação de chaves com Argon2.
+
+Se mantiver este número, a sua base de dados pode ser desbloqueada muito facilmente!</translation>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation>KDF inalterado</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation>Erro ao transformar a chave com os novos parâmetros KDF; KDF inalterado.</translation>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation><numerusform> MiB</numerusform><numerusform> MiB</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation><numerusform>processo</numerusform><numerusform>processos</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation><numerusform>%1 ms</numerusform><numerusform>%1 ms</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -944,7 +1342,7 @@ Se mantiver este número, a sua base de dados pode ser desbloqueada muito facilm
     </message>
     <message>
         <source>Additional Database Settings</source>
-        <translation>Definições extra da base de dados</translation>
+        <translation>Definições extra para a base de dados</translation>
     </message>
     <message>
         <source>Enable &amp;compression (recommended)</source>
@@ -952,91 +1350,112 @@ Se mantiver este número, a sua base de dados pode ser desbloqueada muito facilm
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>Raiz</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Base de dados do KeePass 2</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Todos os ficheiros</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Abrir base de dados</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>Ficheiro não encontrado!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Não foi possível abrir a base de dados.</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>Ficheiro aberto no modo de leitura.</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
+    <message>
+        <source>Add additional protection...</source>
+        <translation>Adicionar proteção extra...</translation>
     </message>
     <message>
-        <source>Open CSV file</source>
-        <translation>Abrir ficheiro CSV</translation>
+        <source>No encryption key added</source>
+        <translation>Chave de cifra não adicionada</translation>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>Ficheiro CSV</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation>Tem que adicionar, pelo menos, uma chave de cifra para proteger a sua base de dados!</translation>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>Todos os ficheiros (*)</translation>
+        <source>No password set</source>
+        <translation>Palavra-passe não definida</translation>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Combinar base de dados</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>AVISO! Não definiu uma palavra-passe. Não deve utilizar uma base de dados que não tenha uma palavra-passe definida!
+
+Tem a certeza de que deseja continuar?</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Abrir base de dados do KeePass 1</translation>
+        <source>Unknown error</source>
+        <translation>Erro desconhecido</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>Base de dados do KeePass 1</translation>
+        <source>Failed to change master key</source>
+        <translation>Erro ao alterar a chave-mestre</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>Close?</source>
-        <translation>Fechar?</translation>
+        <source>Database Name:</source>
+        <translation>Nome da base de dados:</translation>
     </message>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>%1 está em modo de edição.
-Deseja fechar e perder as alterações?</translation>
+        <source>Description:</source>
+        <translation>Descrição:</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>Save changes?</source>
-        <translation>Guardar alterações?</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Base de dados do KeePass 2</translation>
     </message>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>&quot;%1&quot; foi modificada.
-Guardar alterações?</translation>
+        <source>All files</source>
+        <translation>Todos os ficheiros</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Falha ao escrever na base de dados.</translation>
+        <source>Open database</source>
+        <translation>Abrir base de dados</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Palavras-passe</translation>
+        <source>CSV file</source>
+        <translation>Ficheiro CSV</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Guardar base de dados como</translation>
+        <source>Merge database</source>
+        <translation>Combinar base de dados</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Abrir base de dados do KeePass 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>Base de dados do KeePass 1</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1044,43 +1463,44 @@ Guardar alterações?</translation>
     </message>
     <message>
         <source>Writing the CSV file failed.</source>
-        <translation>Falha ao escrever no ficheiro CSV.</translation>
+        <translation>Erro ao escrever no ficheiro CSV.</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>Nova base de dados</translation>
+        <source>Database creation error</source>
+        <translation>Erro ao criar a base de dados</translation>
     </message>
     <message>
-        <source>locked</source>
-        <translation>bloqueada</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>A base de dados criada não tem chave ou KDF e não pode ser guardada.
+Existe aqui um erro que deve ser reportado aos programadores.</translation>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>Bloquear base de dados</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation>O ficheiro da base de dados não existe ou não pode ser acedido.</translation>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>Não é possível bloquear a base de dados, porque esta está a ser editada.
-Prima Cancelar para finalizar as alterações ou descarte-as.</translation>
+        <source>Select CSV file</source>
+        <translation>Selecionar ficheiro CSV</translation>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>Esta base de dados foi modificada.
-Deseja guardar a base de dados antes de a bloquear ?
-Se não o fizer, perderá as suas alterações.</translation>
+        <source>New Database</source>
+        <translation>Nova base de dados</translation>
     </message>
     <message>
-        <source>Disable safe saves?</source>
-        <translation>Desativar salvaguardas?</translation>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Nova base de dados]</translation>
     </message>
     <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>O KeePassXC não conseguiu guardar a base de dados múltiplas vezes. Muito provavelmente, os serviços de sincronização não permitira a gravação.
-Desativar salvaguardas e tentar novamente?</translation>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Bloqueada]</translation>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Apenas leitura]</translation>
     </message>
 </context>
 <context>
@@ -1090,40 +1510,16 @@ Desativar salvaguardas e tentar novamente?</translation>
         <translation>Pesquisar..</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>Alterar chave-mestre</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>Apagar entrada?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
-        <translation>Deseja mesmo apagar permanentemente a entrada &quot;%1&quot;?</translation>
-    </message>
-    <message>
-        <source>Delete entries?</source>
-        <translation>Apagar entradas?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Deseja mesmo apagar permanentemente %1 entradas?</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Mover entrada para a reciclagem?</translation>
+        <translation>Tem a certeza de que deseja apagar permanentemente a entrada &quot;%1&quot;?</translation>
     </message>
     <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>Deseja mesmo mover a entrada &quot;%1&quot; para a reciclagem?</translation>
-    </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Mover entradas para a reciclagem?</translation>
+        <translation>Tem a certeza de que deseja mover a entrada &quot;%1&quot; para a reciclagem?</translation>
     </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation><numerusform>Deseja mesmo mover %n entrada para a reciclagem?</numerusform><numerusform>Deseja mesmo mover %n entradas para a reciclagem?</numerusform></translation>
+        <translation><numerusform>Tem a certeza de que deseja mover %n entrada para a reciclagem?</numerusform><numerusform>Tem a certeza de que deseja mover %n entradas para a reciclagem?</numerusform></translation>
     </message>
     <message>
         <source>Execute command?</source>
@@ -1131,23 +1527,15 @@ Desativar salvaguardas e tentar novamente?</translation>
     </message>
     <message>
         <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
-        <translation>Deseja mesmo executar o seguinte comando?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
+        <translation>Tem a certeza de que deseja executar este comando?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
     </message>
     <message>
         <source>Remember my choice</source>
         <translation>Memorizar escolha</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Apagar grupo?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
-        <translation>Deseja mesmo apagar permanentemente o grupo &quot;%1&quot;?</translation>
-    </message>
-    <message>
-        <source>Unable to calculate master key</source>
-        <translation>Não foi possível calcular a chave-mestre</translation>
+        <translation>Tem a certeza de que deseja apagar permanentemente o grupo &quot;%1&quot;?</translation>
     </message>
     <message>
         <source>No current database.</source>
@@ -1175,17 +1563,13 @@ Desativar salvaguardas e tentar novamente?</translation>
     </message>
     <message>
         <source>Merge Request</source>
-        <translation>Pedido de união</translation>
+        <translation>Pedido de combinação</translation>
     </message>
     <message>
         <source>The database file has changed and you have unsaved changes.
 Do you want to merge your changes?</source>
-        <translation>A base de dados foi alterada e tem alterações não gravadas. 
-Deseja juntar as suas alterações?</translation>
-    </message>
-    <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>Não foi possível abrir a nova base de dados ao tentar recarregar automaticamente essa base de dados.</translation>
+        <translation>A base de dados foi alterada e tem alterações não guardadas. 
+Deseja combinar as suas alterações?</translation>
     </message>
     <message>
         <source>Empty recycle bin?</source>
@@ -1195,88 +1579,107 @@ Deseja juntar as suas alterações?</translation>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>Tem a certeza de que deseja apagar permanentemente os itens da reciclagem?</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>A gerar token TOTP</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation><numerusform>Tem a certeza de que deseja apagar %n entrada?</numerusform><numerusform>Tem a certeza de que deseja apagar %n entradas?</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation><numerusform>Apagar entrada?</numerusform><numerusform>Apagar entradas?</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation><numerusform>Mover entrada para a reciclagem?</numerusform><numerusform>Mover entradas para a reciclagem?</numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Fechar</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Ficheiro aberto no modo de leitura.</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Geral</translation>
+        <source>Lock Database?</source>
+        <translation>Bloquear base de dados?</translation>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Palavra-passe</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation>Está a editar uma entrada. Rejeitar alterações e bloquear?</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot; foi modificada.
+Guardar alterações?</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>Expira</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation>A base de dados foi modificada.
+Guardar alterações?</translation>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Nome de utilizador</translation>
+        <source>Save changes?</source>
+        <translation>Guardar alterações?</translation>
     </message>
     <message>
-        <source>Autotype</source>
-        <translation>Escrita automática</translation>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation>Não foi possível abrir a nova base de dados durante o carregamento
+Erro: %1</translation>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>Pesquisa</translation>
+        <source>Disable safe saves?</source>
+        <translation>Desativar salvaguardas?</translation>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>Atributos</translation>
+        <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>O KeePassXC não conseguiu guardar a base de dados múltiplas vezes. Muito provavelmente, os serviços de sincronização não o permitiram.
+Desativar salvaguardas e tentar novamente?</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Anexos</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation>Erro ao escrever na base de dados:
+%1</translation>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Notas</translation>
+        <source>Passwords</source>
+        <translation>Palavras-passe</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>Janela</translation>
+        <source>Save database as</source>
+        <translation>Guardar base de dados como</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>Sequência</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Base de dados do KeePass 2</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Pesquisa</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Limpar</translation>
+        <source>Delete group</source>
+        <translation>Apagar grupo</translation>
     </message>
     <message>
-        <source>Never</source>
-        <translation>Nunca</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[PROTEGIDA]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>Desativada</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Ativada</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1327,7 +1730,7 @@ Deseja juntar as suas alterações?</translation>
     </message>
     <message>
         <source>Failed to open private key</source>
-        <translation>Falha ao abrir a chave privada</translation>
+        <translation>Erro ao abrir a chave privada</translation>
     </message>
     <message>
         <source>Entry history</source>
@@ -1350,22 +1753,10 @@ Deseja juntar as suas alterações?</translation>
         <translation>Novo atributo</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Confirmação de remoção</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>Tem a certeza de que deseja remover este atributo?</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[PROTEGIDA]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation>Prima Mostrar para ver ou editar</translation>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>Amanhã</translation>
     </message>
@@ -1378,10 +1769,6 @@ Deseja juntar as suas alterações?</translation>
         <translation><numerusform>%n mês</numerusform><numerusform>%n meses</numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 ano</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation>Aplicar palavra-passe gerada?</translation>
     </message>
@@ -1393,6 +1780,26 @@ Deseja juntar as suas alterações?</translation>
         <source>Entry updated successfully.</source>
         <translation>Entrada atualizada com sucesso.</translation>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation>A entrada tem alterações por guardar</translation>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation>Novo atributo %1</translation>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation>[PROTEGIDA] Por favor revele para ver ou editar</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n ano</numerusform><numerusform>%n anos</numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1441,11 +1848,11 @@ Deseja juntar as suas alterações?</translation>
     </message>
     <message>
         <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation>Herdar sequência de escrita automática deste &amp;grupo</translation>
+        <translation>Utilizar sequência de escrita automática deste &amp;grupo</translation>
     </message>
     <message>
         <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation>&amp;Usar sequência personalizada de escrita automática:</translation>
+        <translation>&amp;Utilizar sequência personalizada de escrita automática:</translation>
     </message>
     <message>
         <source>Window Associations</source>
@@ -1538,7 +1945,7 @@ Deseja juntar as suas alterações?</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation>segundos</translation>
+        <translation> segundos</translation>
     </message>
     <message>
         <source>Fingerprint</source>
@@ -1634,7 +2041,82 @@ Deseja juntar as suas alterações?</translation>
     </message>
     <message>
         <source>Inherit from parent group (%1)</source>
-        <translation>Herdar a partir do grupo (%1)</translation>
+        <translation>Herdar do grupo (%1)</translation>
+    </message>
+</context>
+<context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulário</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Palavra-passe:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1661,7 +2143,7 @@ Deseja juntar as suas alterações?</translation>
     </message>
     <message>
         <source>&amp;Use default Auto-Type sequence of parent group</source>
-        <translation>Herdar sequência de escrita a&amp;utomática do grupo relacionado</translation>
+        <translation>&amp;Utilizar sequência de escrita automática do grupo relacionado</translation>
     </message>
     <message>
         <source>Set default Auto-Type se&amp;quence</source>
@@ -1695,10 +2177,6 @@ Deseja juntar as suas alterações?</translation>
         <translation>Não foi possível obter o &apos;favicon&apos;.</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Dica: pode ativar o Google como recurso em Ferramentas -&gt; Definições -&gt; Segurança</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>Imagens</translation>
     </message>
@@ -1707,14 +2185,6 @@ Deseja juntar as suas alterações?</translation>
         <translation>Todos os ficheiros</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Selecionar imagem</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read icon</source>
-        <translation>Incapaz de ler o ícone</translation>
-    </message>
-    <message>
         <source>Custom icon already exists</source>
         <translation>Já existe um ícone personalizado</translation>
     </message>
@@ -1723,8 +2193,36 @@ Deseja juntar as suas alterações?</translation>
         <translation>Confirmação de eliminação</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>Este ícone está a ser utilizado por %1 entradas e será substituído pelo ícone padrão. Tem a certeza de que deseja apagar o ícone?</translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation>Ícone personalizado descarregado com sucesso</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>Dica: pode ativar o serviço DuckDuckGo como recurso em Ferramentas -&gt; Definições -&gt; Segurança</translation>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation>Selecionar imagens</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation><numerusform>%1 de %n ícones carregado com sucesso.</numerusform><numerusform>%1 de %n ícones carregados com sucesso.</numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation>Não foram carregados ícones</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation><numerusform>%n ícone já existe na sua base de dados.</numerusform><numerusform>%n ícones já existem na sua base de dados.</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation><numerusform>O ícone seguinte falhou:</numerusform><numerusform>Os ícones seguintes falharam:</numerusform></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 ícone é utilizado por % entrada e será substituído pelo ícone padrão. Tem a certeza de que deseja apagar o ícone?</numerusform><numerusform>Este ícone é utilizado por % entradas e será substituído pelo ícone padrão. Tem a certeza de que deseja apagar o ícone?</numerusform></translation>
     </message>
 </context>
 <context>
@@ -1743,11 +2241,11 @@ Deseja juntar as suas alterações?</translation>
     </message>
     <message>
         <source>Uuid:</source>
-        <translation>Uuid:</translation>
+        <translation>UUID:</translation>
     </message>
     <message>
         <source>Plugin Data</source>
-        <translation>Dados do plugin</translation>
+        <translation>Dados do suplemento</translation>
     </message>
     <message>
         <source>Remove</source>
@@ -1755,12 +2253,12 @@ Deseja juntar as suas alterações?</translation>
     </message>
     <message>
         <source>Delete plugin data?</source>
-        <translation>Apagar dados do plugin?</translation>
+        <translation>Apagar dados do suplemento?</translation>
     </message>
     <message>
         <source>Do you really want to delete the selected plugin data?
 This may cause the affected plugins to malfunction.</source>
-        <translation>Tem a certeza de que deseja apagar os dados do plugin?
+        <translation>Tem a certeza de que deseja apagar os dados do suplemento?
 Esta ação pode implicar um funcionamento errático.</translation>
     </message>
     <message>
@@ -1775,9 +2273,8 @@ Esta ação pode implicar um funcionamento errático.</translation>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation>- Cópia</translation>
+        <source>%1 - Clone</source>
+        <translation>%1 - Clone</translation>
     </message>
 </context>
 <context>
@@ -1819,11 +2316,7 @@ Esta ação pode implicar um funcionamento errático.</translation>
     </message>
     <message numerus="yes">
         <source>Are you sure you want to remove %n attachment(s)?</source>
-        <translation><numerusform>Tem a certeza de que deseja remover %n anexo?</numerusform><numerusform>Tem a certeza de que deseja remover %n anexo(s)?</numerusform></translation>
-    </message>
-    <message>
-        <source>Confirm Remove</source>
-        <translation>Confirmação de remoção</translation>
+        <translation><numerusform>Tem a certeza de que deseja remover %n anexo?</numerusform><numerusform>Tem a certeza de que deseja remover %n anexos?</numerusform></translation>
     </message>
     <message>
         <source>Save attachments</source>
@@ -1862,10 +2355,13 @@ Esta ação pode implicar um funcionamento errático.</translation>
 %1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation>Confirmação de remoção</translation>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>Não foi possível abrir os ficheiros:
-%1</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1949,6 +2445,106 @@ Esta ação pode implicar um funcionamento errático.</translation>
         <source>Attachments</source>
         <translation>Anexos</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>Sim</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>A gerar token TOTP</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Fechar</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Geral</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Nome de utilizador</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Palavra-passe</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Expira</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>Atributos</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Anexos</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notas</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Escrita automática</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Janela</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Sequência</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Pesquisa</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Pesquisa</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Limpar</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Nunca</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[PROTEGIDA]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Ativada</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Desativada</translation>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EntryView</name>
@@ -1987,6 +2583,19 @@ Esta ação pode implicar um funcionamento errático.</translation>
         <source>Recycle Bin</source>
         <translation>Reciclagem</translation>
     </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation>[vazia]</translation>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>HostInstaller</name>
@@ -2000,61 +2609,6 @@ Esta ação pode implicar um funcionamento errático.</translation>
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>Comprimento:</translation>
-    </message>
-    <message>
-        <source>Character Types</source>
-        <translation>Tipos de caracteres</translation>
-    </message>
-    <message>
-        <source>Upper Case Letters</source>
-        <translation>Letras maiúsculas</translation>
-    </message>
-    <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
-    </message>
-    <message>
-        <source>Lower Case Letters</source>
-        <translation>Letras minúsculas</translation>
-    </message>
-    <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
-    </message>
-    <message>
-        <source>Numbers</source>
-        <translation>Números</translation>
-    </message>
-    <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
-    </message>
-    <message>
-        <source>Special Characters</source>
-        <translation>Caracteres especiais</translation>
-    </message>
-    <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
-    </message>
-    <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Excluir caracteres semelhantes</translation>
-    </message>
-    <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>Certificar de que a palavra-passe contém caracteres de todos os grupos</translation>
-    </message>
-    <message>
-        <source>Extended ASCII</source>
-        <translation>ASCII expandido</translation>
-    </message>
-</context>
-<context>
     <name>KMessageWidget</name>
     <message>
         <source>&amp;Close</source>
@@ -2079,6 +2633,26 @@ Esta ação pode implicar um funcionamento errático.</translation>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Chave errada ou base de dados danificada.</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation>cabeçalhos em falta da base de dados</translation>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation>Disparidade de &apos;hash&apos; no cabeçalho</translation>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>Tamanho do id do cabeçalho inválido</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>Comprimento do campo de cabeçalho inválido</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>Comprimento dos dados de cabeçalho inválido</translation>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2095,7 +2669,7 @@ Esta ação pode implicar um funcionamento errático.</translation>
     <name>Kdbx4Reader</name>
     <message>
         <source>missing database headers</source>
-        <translation>cabeçalhos em falta</translation>
+        <translation>cabeçalhos em falta da base de dados</translation>
     </message>
     <message>
         <source>Unable to calculate master key</source>
@@ -2131,7 +2705,7 @@ Esta ação pode implicar um funcionamento errático.</translation>
     </message>
     <message>
         <source>Failed to open buffer for KDF parameters in header</source>
-        <translation>Falha ao processar os parâmetros KDF no cabeçalho</translation>
+        <translation>Erro ao processar os parâmetros KDF no cabeçalho</translation>
     </message>
     <message>
         <source>Unsupported key derivation function (KDF) or invalid parameters</source>
@@ -2232,16 +2806,12 @@ Esta ação pode implicar um funcionamento errático.</translation>
     <message>
         <source>Failed to serialize KDF parameters variant map</source>
         <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
-        <translation>Falhou a serialização dos parâmetros da KDF (função de derivação de chave) da variante do mapa</translation>
+        <translation>Erro ao serializar os parâmetros KDF da variante do mapa</translation>
     </message>
 </context>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation>Comprimento inválido da cifra UUID (identificador único universal)</translation>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation>Cifra não suportada</translation>
     </message>
@@ -2263,7 +2833,7 @@ Esta ação pode implicar um funcionamento errático.</translation>
     </message>
     <message>
         <source>Invalid transform rounds size</source>
-        <translation>Tamanho inválido para os ciclos de transformação </translation>
+        <translation>Tamanho inválido para os ciclos de transformação</translation>
     </message>
     <message>
         <source>Invalid start bytes size</source>
@@ -2295,12 +2865,24 @@ Esta é uma migração unidirecional. Não será possível abrir a base de dados
         <source>Unsupported KeePass 2 database version.</source>
         <translation>Versão da base de dados KeePass2 não suportada.</translation>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation>Tamanho inválido para o UUID da cifra: %1 (tamanho=%2)</translation>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation>Não foi possível processar UUID: %1</translation>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
     <message>
         <source>XML parsing failure: %1</source>
-        <translation>Falha no processamento XML: %1</translation>
+        <translation>Erro ao processar o XML: %1</translation>
     </message>
     <message>
         <source>No root group</source>
@@ -2308,7 +2890,7 @@ Esta é uma migração unidirecional. Não será possível abrir a base de dados
     </message>
     <message>
         <source>Missing icon uuid or data</source>
-        <translation>Dados ou uuid do ícone em falta</translation>
+        <translation>Dados ou UUID do ícone em falta</translation>
     </message>
     <message>
         <source>Missing custom data key or value</source>
@@ -2320,7 +2902,7 @@ Esta é uma migração unidirecional. Não será possível abrir a base de dados
     </message>
     <message>
         <source>Null group uuid</source>
-        <translation>UUID (identificador único universal) de grupo nulo</translation>
+        <translation>UUID de grupo nulo</translation>
     </message>
     <message>
         <source>Invalid group icon number</source>
@@ -2340,19 +2922,19 @@ Esta é uma migração unidirecional. Não será possível abrir a base de dados
     </message>
     <message>
         <source>Null DeleteObject uuid</source>
-        <translation>UUID (identificador único universal) de DeleteObject nulo</translation>
+        <translation>UUID nulo em DeleteObject</translation>
     </message>
     <message>
         <source>Missing DeletedObject uuid or time</source>
-        <translation>Tempo ou UUID (identificador único universal) de DeletedObject em falta</translation>
+        <translation>Tempo ou UUID em falta para DeletedObject</translation>
     </message>
     <message>
         <source>Null entry uuid</source>
-        <translation>Entrada de UUID (identificador único universal) nula</translation>
+        <translation>Entrada de UUID nula</translation>
     </message>
     <message>
         <source>Invalid entry icon number</source>
-        <translation>Número inválido da entrada de ícone</translation>
+        <translation>Número inválido na entrada de ícone</translation>
     </message>
     <message>
         <source>History element in history entry</source>
@@ -2360,15 +2942,11 @@ Esta é uma migração unidirecional. Não será possível abrir a base de dados
     </message>
     <message>
         <source>No entry uuid found</source>
-        <translation>Não foi encontrada nenhuma entrada UUID (identificador único universal)</translation>
+        <translation>Não foi encontrado o UUID da entrada</translation>
     </message>
     <message>
         <source>History element with different uuid</source>
-        <translation>Elemento do histórico com uuid diferente</translation>
-    </message>
-    <message>
-        <source>Unable to decrypt entry string</source>
-        <translation>Não foi possível decifrar a cadeia vazia</translation>
+        <translation>Elemento do histórico com UUID diferente</translation>
     </message>
     <message>
         <source>Duplicate custom attribute found</source>
@@ -2412,13 +2990,21 @@ Esta é uma migração unidirecional. Não será possível abrir a base de dados
     </message>
     <message>
         <source>Invalid uuid value</source>
-        <translation>Valor uuid inválido</translation>
+        <translation>Valor UUID inválido</translation>
     </message>
     <message>
         <source>Unable to decompress binary</source>
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation>Não foi possível descomprimir o binário</translation>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation>Erro no XML:
+%1
+Linha %2, coluna %3</translation>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2492,7 +3078,7 @@ Esta é uma migração unidirecional. Não será possível abrir a base de dados
     </message>
     <message>
         <source>Key transformation failed</source>
-        <translation>Falha ao transformar a chave</translation>
+        <translation>Erro ao transformar a chave</translation>
     </message>
     <message>
         <source>Invalid group field type number</source>
@@ -2556,7 +3142,7 @@ Esta é uma migração unidirecional. Não será possível abrir a base de dados
     </message>
     <message>
         <source>Invalid entry uuid field size</source>
-        <translation>Tamanho da entrada para o campo UUID (identificador único universal) inválido</translation>
+        <translation>Tamanho da entrada para o campo UUID inválido</translation>
     </message>
     <message>
         <source>Invalid entry group id field size</source>
@@ -2582,28 +3168,130 @@ Esta é uma migração unidirecional. Não será possível abrir a base de dados
         <source>Invalid entry field type</source>
         <translation>Tipo inválido para o campo da entrada</translation>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation>Não foi possível pesquisar no conteúdo</translation>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>O ficheiro de bloqueio da instância única é inválido. A iniciar nova instância.</translation>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>Não foi possível criar o ficheiro de bloqueio. Modo de única instância desativado.</translation>
+        <source>Import from</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Já está em execução uma instância do KeePassXC.</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Erro fatal ao testar as funções de criptografia.</translation>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Erro</translation>
+        <source>Key Component</source>
+        <translation>Componente chave</translation>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation>Descrição do componente chave</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation>Componente chave definido, clique para alterar ou remover</translation>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation>Adicionar %1</translation>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation>Alterar %1</translation>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation>Remover %1</translation>
+    </message>
+    <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>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>Explorar</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Gerar</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation>Ficheiro-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;Para mais segurança, pode adicionar um ficheiro-chave que contenha dados aleatórios.&lt;/p&gt;&lt;p&gt;Tem que o manter secreto e não o pode perder pois se o fizer não mais poderá abrir a base de dados.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation>Formato legado de ficheiro-chave</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á a utilizar um formato legado que pode, no futuro, deixar
+de ser suportado.
+
+Aceda às definições da chave-mestre para gerar um novo ficheiro-chave.</translation>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation>Erro ao carregar o ficheiro-chave %1
+Mensagem: %2</translation>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Ficheiros-chave</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Todos os ficheiros</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Criar ficheiro-chave...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation>Erro ao criar o ficheiro-chave</translation>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation>Não foi possível criar o ficheiro-chave: %1</translation>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Selecione o ficheiro-chave</translation>
     </message>
 </context>
 <context>
@@ -2617,10 +3305,6 @@ Esta é uma migração unidirecional. Não será possível abrir a base de dados
         <translation>Bases de dados &amp;recentes</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Importar</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation>Aj&amp;uda</translation>
     </message>
@@ -2629,14 +3313,6 @@ Esta é uma migração unidirecional. Não será possível abrir a base de dados
         <translation>E&amp;ntradas</translation>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>Copiar at&amp;ributo para a área de transferência</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation>Palavra-passe única baseada em tempo</translation>
-    </message>
-    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Grupos</translation>
     </message>
@@ -2665,30 +3341,10 @@ Esta é uma migração unidirecional. Não será possível abrir a base de dados
         <translation>Fe&amp;char base de dados</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>&amp;Nova base de dados</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>Juntar a partir de base de dados do KeePassX</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>&amp;Adicionar nova entrada</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>&amp;Ver/editar entrada</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>Apagar entra&amp;da</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>&amp;Adicionar novo grupo</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>&amp;Editar grupo</translation>
     </message>
@@ -2701,14 +3357,6 @@ Esta é uma migração unidirecional. Não será possível abrir a base de dados
         <translation>G&amp;uardar base de dados como...</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Alterar chave-&amp;mestre...</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>&amp;Definições da base de dados</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>Definições da base de dados</translation>
     </message>
@@ -2717,10 +3365,6 @@ Esta é uma migração unidirecional. Não será possível abrir a base de dados
         <translation>&amp;Clonar entrada</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>Locali&amp;zar</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>Copiar nome de &amp;utilizador</translation>
     </message>
@@ -2729,10 +3373,6 @@ Esta é uma migração unidirecional. Não será possível abrir a base de dados
         <translation>Copiar nome de utilizador para a área de transferência</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>Cop&amp;iar palavra-passe</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>Copiar palavra-passe para a área de transferência</translation>
     </message>
@@ -2742,19 +3382,11 @@ Esta é uma migração unidirecional. Não será possível abrir a base de dados
     </message>
     <message>
         <source>Password Generator</source>
-        <translation>Gerador de palavra-passe</translation>
-    </message>
-    <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation>E&amp;xecutar escrita automática</translation>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>Abrir &amp;URL</translation>
+        <translation>Gerador de palavras-passe</translation>
     </message>
     <message>
         <source>&amp;Lock databases</source>
-        <translation>B&amp;loquear base de dados</translation>
+        <translation>B&amp;loquear bases de dados</translation>
     </message>
     <message>
         <source>&amp;Title</source>
@@ -2785,22 +3417,6 @@ Esta é uma migração unidirecional. Não será possível abrir a base de dados
         <translation>&amp;Exportar para ficheiro CSV...</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Importar base de dados do KeePass 1...</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>Importar ficheiro CSV...</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Re&amp;parar base de dados...</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>Mostrar TOTP</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>Configurar TOTP...</translation>
     </message>
@@ -2821,14 +3437,6 @@ Esta é uma migração unidirecional. Não será possível abrir a base de dados
         <translation>Erro de acesso ao ficheiro %1</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Parece que está a utilizar KeepassHTTP para integração com o navegador. Esta funcionalidade foi descontinuada e será removida brevemente.&lt;br&gt;Considere a utilização de KeePassXC-Browser! Para obter ajuda na migração, aceda ao nosso &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;guia de migração&lt;/a&gt; (aviso %1 de 3).&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>apenas leitura</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Definições</translation>
     </message>
@@ -2841,36 +3449,278 @@ Esta é uma migração unidirecional. Não será possível abrir a base de dados
         <translation>Sair do KeePassXC</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Base de dados do KeePass 2</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Toque no botão da sua YubiKey!</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Todos os ficheiros</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation>AVISO: está a utilizar uma versão instável do KeePassXC!
+Existe um risco elevado de corrupção de ficheiros. Faça uma cópia de segurança da base de dados.
+Esta versão não deve ser utilizada para uma utilização regular.</translation>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Abrir base de dados</translation>
+        <source>&amp;Donate</source>
+        <translation>&amp;Donativos</translation>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Guardar base de dados reparada</translation>
+        <source>Report a &amp;bug</source>
+        <translation>Reportar um &amp;erro</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Falha ao escrever na base de dados.</translation>
+        <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>AVISO: a versão Qt do seu sistema pode causar o encerramento do KeePassXC se estiver a utilizar o teclado no ecrã (On-Screen Keyboard)!
+Recomendamos que utilize a versão AppImage disponível no nosso site.</translation>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Toque no botão da sua YubiKey!</translation>
+        <source>&amp;Import</source>
+        <translation>&amp;Importar</translation>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
-        <translation>AVISO: está a utilizar uma versão instável do KeepassXC!
-Existe um risco bastante grande e deve efetuar um backup da base de dados.
-Esta versão não deve ser utilizada para uma utilização regular.</translation>
+        <source>Copy att&amp;ribute...</source>
+        <translation>Copiar at&amp;ributo...</translation>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation>TOTP...</translation>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation>&amp;Nova base de dados...</translation>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation>Criar uma nova base de dados</translation>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation>Co&amp;mbinar da bases de dados...</translation>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation>Combinar com outra base de dados KDBX</translation>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation>&amp;Nova entrada</translation>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation>Adicionar uma nova entrada</translation>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation>&amp;Editar entrada</translation>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation>Ver ou editar entrada</translation>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation>&amp;Novo grupo</translation>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation>Adicionar um novo grupo</translation>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation>Alterar chave-&amp;mestre...</translation>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation>&amp;Definições da base de dados...</translation>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation>Copiar &amp;palavra-passe</translation>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation>Execut&amp;ar escrita automática</translation>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation>Abrir &amp;URL</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation>Base de dados do KeePass 1...</translation>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation>Importar base de dados do KeePass 1</translation>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation>Ficheiro CSV...</translation>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation>Importar ficheiro CSV</translation>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation>Mostrar TOTP...</translation>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation>Mostrar código QR TOTP...</translation>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation>A criar %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation>A alocar %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation>A substituir %1 [%2]</translation>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation>entrada antiga combinada da base de dados %1</translation>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation>A adicionar a cópia de segurança para o destino antigo %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation>A adicionar a cópia de segurança para a origem antiga %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation>A reaplicar a entrada de destino antiga na origem recente %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation>A reaplicar a entrada de origem antiga no destinio recente %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation>A sincronizar da origem recente %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation>A sincronizar da origem antiga %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation>A apagar dependente %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation>A apagar órfão %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation>Objetos apagados alterados</translation>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation>Adicionar ícone em falta %1</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation>A criar uma nova base de dados do KeePassXC...</translation>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Raiz</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>Assistente</translation>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation>Definições de &amp;cifra</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>Aqui pode ajustar as definições de cifra da sua base de dados. Não se preocupe porque pode sempre reverter as alterações nas definições.</translation>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Definições avançadas</translation>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation>Definições básicas</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <translation>Definições de cifra</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>Aqui pode ajustar as definições de cifra da sua base de dados. Não se preocupe porque pode sempre reverter as alterações nas definições.</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation>Chave-mestre da base de dados</translation>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation>Uma chave-mestre apenas sua e que protege a base de dados.</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <translation>Informação geral sobre a base de dados</translation>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation>Preencha o nome de exibição e uma descrição extra para a sua nova base de dados:</translation>
     </message>
 </context>
 <context>
@@ -2885,7 +3735,7 @@ Esta versão não deve ser utilizada para uma utilização regular.</translation
     </message>
     <message>
         <source>Base64 decoding failed</source>
-        <translation>Falha na descodificação Base64</translation>
+        <translation>Erro de descodificação Base64</translation>
     </message>
     <message>
         <source>Key file way too small.</source>
@@ -2901,7 +3751,7 @@ Esta versão não deve ser utilizada para uma utilização regular.</translation
     </message>
     <message>
         <source>Failed to read public key.</source>
-        <translation>Falha ao ler a chave pública.</translation>
+        <translation>Erro ao ler a chave pública.</translation>
     </message>
     <message>
         <source>Corrupted key file, reading private key failed</source>
@@ -2921,11 +3771,11 @@ Esta versão não deve ser utilizada para uma utilização regular.</translation
     </message>
     <message>
         <source>Key derivation failed, key file corrupted?</source>
-        <translation>Falha na derivação da chave, ficheiro chave danificado?</translation>
+        <translation>Erro na derivação da chave, ficheiro-chave danificado?</translation>
     </message>
     <message>
         <source>Decryption failed, wrong passphrase?</source>
-        <translation>Falha ao decifrar, frase-chave errada?</translation>
+        <translation>Erro ao decifrar, frase-chave errada?</translation>
     </message>
     <message>
         <source>Unexpected EOF while reading public key</source>
@@ -2973,125 +3823,34 @@ Esta versão não deve ser utilizada para uma utilização regular.</translation
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation>Diálogo</translation>
-    </message>
-    <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>Necessária para aceder às bases de dados através do ChromeIPass ou do PassIFox</translation>
-    </message>
-    <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>Ativar servidor KeePassHTTP</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Geral</translation>
-    </message>
-    <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>M&amp;ostrar notificação se as credenciais forem solicitadas</translation>
-    </message>
-    <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>Apenas devolve as melhores entradas para o URL específico em vez das entradas para o domínio.</translation>
-    </message>
-    <message>
-        <source>&amp;Return only best matching entries</source>
-        <translation>Devolve&amp;r apenas as entradas coincidentes</translation>
-    </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 esta estiver bloqueada</translation>
-    </message>
-    <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation>Apenas serão devolvidas as entradas com o mesmo esquema (http://, https://, ftp://, ...).</translation>
-    </message>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>&amp;Match URL schemes</source>
-        <translation>Corresponder com os esque&amp;mas do URL</translation>
-    </message>
-    <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Ordenar entradas coincidentes por nome de &amp;utilizador</translation>
-    </message>
-    <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Ordenar &amp;entradas por título</translation>
-    </message>
-    <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>R&amp;emover todas as chaves de cifra partilhadas da base de dados ativa</translation>
-    </message>
-    <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>Re&amp;mover todas as permissões guardadas para as entradas da base de dados ativa</translation>
-    </message>
-    <message>
-        <source>Password Generator</source>
-        <translation>Gerador de palavra-passe</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Avançado</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Permitir sempre &amp;acesso às entradas</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Permitir sempre at&amp;ualizar as entradas</translation>
-    </message>
-    <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>Apenas a base de dados selecionada tem que estar conectada a um cliente.</translation>
-    </message>
-    <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Pesquisar por entradas semel&amp;hantes em todas as base de dados abertas</translation>
-    </message>
-    <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>A criação ou atualização dos campos de cadeias não é suportada.</translation>
-    </message>
-    <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>Most&amp;rar campos avançados que começam com &quot;KPH: &quot;</translation>
-    </message>
-    <message>
-        <source>HTTP Port:</source>
-        <translation>Porta HTTP:</translation>
+        <source>Enter password:</source>
+        <translation>Introduza a palavra-passe:</translation>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Porta padrão: 19455</translation>
+        <source>Confirm password:</source>
+        <translation>Confirmação de palavra-passe:</translation>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>O KeePassXC vai escutar nesta porta em 127.0.0.1</translation>
+        <source>Password</source>
+        <translation>Palavra-passe</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;Atenção&lt;/b&gt;: as opções seguintes podem ser perigosas!</translation>
+        <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;A palavra-passe é o método primário para proteger a sua base de dados.&lt;/p&gt;&lt;p&gt;As boas palavras-passe são extensão e únicas. O KeePassXC pode gerar uma palavra-passe por si.&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;A  funcionalidade KeePassHTTP foi descontinuada e será removida brevemente.&lt;br&gt;Considere a utilização de KeePassXC-Browser! Para obter ajuda na migração, aceda ao nosso &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;guia de migração&lt;/a&gt;.&lt;/p&gt;</translation>
+        <source>Password cannot be empty.</source>
+        <translation>Palavra-passe não pode ser vazia.</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Incapaz de associar às portas privilegiadas </translation>
+        <source>Passwords do not match.</source>
+        <translation>Disparidade nas palavras-passe.</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Não é possível associar a portas privilegiadas inferiores à 1024!
-Será utilizada a porta 19455 (padrão).</translation>
+        <source>Generate master password</source>
+        <translation>Gerar palavra-passe principal</translation>
     </message>
 </context>
 <context>
@@ -3162,18 +3921,10 @@ Será utilizada a porta 19455 (padrão).</translation>
         <translation>Lista de palavras:</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Número de palavras:</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>Separador de palavras:</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>Gerar</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
@@ -3186,10 +3937,6 @@ Será utilizada a porta 19455 (padrão).</translation>
         <translation>Fechar</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>Aplicar</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>Entropia: %1 bit</translation>
     </message>
@@ -3217,6 +3964,171 @@ Será utilizada a porta 19455 (padrão).</translation>
         <comment>Password quality</comment>
         <translation>Excelente</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation>ASCII expandido</translation>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation>Ativar modo avançado</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Avançado</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation>Letras maiúsculas de A até F</translation>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation>Letras minúsculas de A até F</translation>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation>Parênteses</translation>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation>{[(</translation>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation>Pontuação</translation>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation>.,:;</translation>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation>Aspas</translation>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation>&quot; &apos;</translation>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation>Matemática</translation>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation>&lt;*+!?=</translation>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation>Traços</translation>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation>\_|-/</translation>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation>Logo-gramas</translation>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation>#$%&amp;&amp;@^`~</translation>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation>Trocar para o modo básico</translation>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation>Básico</translation>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation>Conjunto de caracteres a excluir da palavra-passe gerada</translation>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation>Não incluir:</translation>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation>Adicionar letras &apos;non-hex&apos; à lista de exclusão</translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation>Hex</translation>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation>Caracteres excluídos: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</translation>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation>&amp;Número de palavras:</translation>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation>Recriar</translation>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Apagar</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Remover</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Desativar</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3237,34 +4149,18 @@ Será utilizada a porta 19455 (padrão).</translation>
         <translation>Não foi possível decifrar a mensagem</translation>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
-        <translation>Tempo limite atingido ou não foi possível comunicar com o KeePassXC</translation>
-    </message>
-    <message>
         <source>Action cancelled or denied</source>
         <translation>Ação cancelada ou recusada</translation>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation>Mensagem não decifrada ou chave pública não encontrada, Ativou as mensagens nativas no KeePassXC?</translation>
-    </message>
-    <message>
         <source>KeePassXC association failed, try again</source>
-        <translation>Falha ao associar o KeePassXC. Tente novamente.</translation>
-    </message>
-    <message>
-        <source>Key change was not successful</source>
-        <translation>Alteração de chave não efetuada</translation>
+        <translation>Erro ao associar o KeePassXC. Tente novamente.</translation>
     </message>
     <message>
         <source>Encryption key is not recognized</source>
         <translation>Chave de cifra não reconhecida</translation>
     </message>
     <message>
-        <source>No saved databases found</source>
-        <translation>Não existem bases de dados guardadas</translation>
-    </message>
-    <message>
         <source>Incorrect action</source>
         <translation>Ação incorreta</translation>
     </message>
@@ -3387,11 +4283,7 @@ Será utilizada a porta 19455 (padrão).</translation>
     </message>
     <message>
         <source>Insert password to unlock %1: </source>
-        <translation>Introduza a palavra-passe para desbloquear %1.</translation>
-    </message>
-    <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation>Falha ao carregar o ficheiro-chave %1: %2</translation>
+        <translation>Introduza a palavra-passe para desbloquear %1: </translation>
     </message>
     <message>
         <source>WARNING: You are using a legacy key file format which may become
@@ -3431,7 +4323,7 @@ Comandos disponíveis:
     </message>
     <message>
         <source>Search term.</source>
-        <translation>Termo de pesquisa</translation>
+        <translation>Termo de pesquisa.</translation>
     </message>
     <message>
         <source>Merge two databases.</source>
@@ -3447,7 +4339,7 @@ Comandos disponíveis:
     </message>
     <message>
         <source>Use the same credentials for both database files.</source>
-        <translation>Utilizar as mesmas credenciais para ambos os ficheiros.</translation>
+        <translation>Utilizar as mesmas credenciais para ambos os ficheiros de bases de dados.</translation>
     </message>
     <message>
         <source>Key file of the database to merge from.</source>
@@ -3478,12 +4370,6 @@ Comandos disponíveis:
         <translation>erro ao ler do dispositivo</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>ficheiro vazio!
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation>cadeira mal fomada</translation>
     </message>
@@ -3492,30 +4378,6 @@ Comandos disponíveis:
         <translation>carácter de fecho em falta</translation>
     </message>
     <message>
-        <source>AES: 256-bit</source>
-        <translation>AES: 256-bit</translation>
-    </message>
-    <message>
-        <source>Twofish: 256-bit</source>
-        <translation>Twofish: 256-bit</translation>
-    </message>
-    <message>
-        <source>ChaCha20: 256-bit</source>
-        <translation>ChaCha20: 256-bit</translation>
-    </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – recomendado)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 4)</source>
-        <translation>AES-KDF (KDBX 4)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 3.1)</source>
-        <translation>AES-KDF (KDBX 3.1)</translation>
-    </message>
-    <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
@@ -3544,10 +4406,6 @@ Comandos disponíveis:
         <translation>Criada</translation>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
-        <translation>Integração com navegador (legada)</translation>
-    </message>
-    <message>
         <source>Browser Integration</source>
         <translation>Integração com navegador</translation>
     </message>
@@ -3576,10 +4434,6 @@ Comandos disponíveis:
         <translation>Número de palavras para a palavra-passe.</translation>
     </message>
     <message>
-        <source>count</source>
-        <translation>número</translation>
-    </message>
-    <message>
         <source>Wordlist for the diceware generator.
 [Default: EFF English]</source>
         <translation>Lista de palavras para o gerador.
@@ -3590,51 +4444,464 @@ Comandos disponíveis:
         <translation>Gerar nova palavra-passe aleatória.</translation>
     </message>
     <message>
-        <source>Length of the generated password.</source>
-        <translation>Tamanho da palavra-passe gerada.</translation>
+        <source>Invalid value for password length %1.</source>
+        <translation>Valor inválido para o tamanho da palavra-passe %1</translation>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation>Não foi possível criar a entrada com o caminho %1</translation>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
-        <translation>Utilizar letras minúsculas para a palavra-passe gerada.</translation>
+        <source>Enter password for new entry: </source>
+        <translation>Introduza a palavra-passe para a nova entrada: </translation>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
-        <translation>Utilizar letras maiúsculas para a palavra-passe gerada.</translation>
+        <source>Writing the database failed %1.</source>
+        <translation>Erro ao escrever na base de dados %1.</translation>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
-        <translation>Utilizar números para a palavra-passe gerada.</translation>
+        <source>Successfully added entry %1.</source>
+        <translation>Entrada %1 adicionada com sucesso</translation>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
-        <translation>Utilizar caracteres especiais para a palavra-passe gerada.</translation>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation>Copiar TOTP atual para a área de transferência</translation>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
-        <translation>Utilizar ASCII estendido para a palavra-passe gerada.</translation>
+        <source>Invalid timeout value %1.</source>
+        <translation>Valor limite inválido %1</translation>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation>Entrada %1 não encontrada</translation>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation>A entrada com o caminho %1 não tem uma TOTP configurada.</translation>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation>TOTP da entrada atual copiada para a área de transferência!</translation>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation>Palavra-passe da entrada atual copiada para a área de transferência!</translation>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation><numerusform>A área de transferência será limpa dentro de %1 segundo...</numerusform><numerusform>A área de transferência será limpa dentro de %1 segundos...</numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation>Área de transferência limpa!</translation>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation>Silenciar pedidos de palavra-passe e outros resultados secundários.</translation>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation>número</translation>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation>Valor inválido para o tamanho da palavra-passe: %1</translation>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation>Não foi possível encontrar a entrada com o caminho %1.</translation>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation>Não foi alterado qualquer campo para a entrada %1.</translation>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation>Introduza a nova palavra-passe da entrada: </translation>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation>Erro ao escrever na base de dados: %1</translation>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation>Entrada %1 editada com sucesso.</translation>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation>Tamanho %1</translation>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation>Entropia %1</translation>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation>Log10 %1</translation>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation>Bits extra multi-palavra %1</translation>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation>Tipo: Bruteforce</translation>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation>Tipo: Dictionary</translation>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation>Tipo: Dict+Leet</translation>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation>Tipo: User Words</translation>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation>Tipo: User+Leet</translation>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation>Tipo: Repeated</translation>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation>Tipo: Sequence</translation>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation>Tipo: Spatial</translation>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation>Tipo: Date</translation>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation>Tipo: Bruteforce(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation>Tipo: Dictionary(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation>Tipo: Dict+Leet(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation>Tipo: User Words(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation>Tipo: User+Leet(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation>Tipo: Repeated(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation>Tipo: Sequence(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation>Tipo: Spatial(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation>Tipo: Date(Rep)</translation>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation>Tipo: Desconhecido%1</translation>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation>Entropia %1 (%2)</translation>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation>*** Tamanho da palavra-passe (%1) != soma do tamanho das partes (%2) ***</translation>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation>Erro ao carregar o ficheiro-chave %1: %2</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>%1 não existe.</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Não foi possível abrir o ficheiro %1.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation>Erro ao ler a base de dados:
+%1</translation>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation>Erro ao analisar a base de dados:
+%1</translation>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation>Tamanho da palavra-passe gerada</translation>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation>Utilizar letras minúsculas</translation>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation>Utilizar letras maiúsculas</translation>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation>Utilizar números</translation>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation>Utilizar caracteres especiais</translation>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation>Utilizar ASCII expandido</translation>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation>Conjunto de caracteres a excluir</translation>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation>caracteres</translation>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation>Excluir caracteres semelhantes</translation>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation>Incluir caracteres de todos os grupos selecionados</translation>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation>Listar recursivamente todos os elementos do grupo</translation>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation>Não foi possível encontrar o grupo %1.</translation>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation>Erro ao ler o ficheiro de combinação:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation>Não foi possível guardar a base de dados no ficheiro: %1</translation>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation>Não foi possível guardar a base de dados no ficheiro: %1</translation>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation>A entrada %1 foi movida para a reciclagem.</translation>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation>A entrada %1 foi eliminada.</translation>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation>Mostrar TOTP atual da entrada.</translation>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation>Erro: atributo desconhecido %1</translation>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation>Não definiu um programa para manipulação da área de transferência</translation>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation>Não foi possível iniciar %1</translation>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation>ficheiro vazio</translation>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation>%1: (linha, coluna) %2,%3</translation>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256-bit</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256-bit</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256-bit</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – recomendado)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation>Definições inválidas</translation>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation>Chave inválida</translation>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>Remover uma entrada da base de dados.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>Caminho da entrada a remover.</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>O ficheiro de bloqueio da instância única é inválido. A iniciar nova instância.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Não foi possível criar o ficheiro de bloqueio. Modo de única instância desativado.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - Gestor de palavras-passe multi-plataforma</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>nome de ficheiro das bases de dados a abrir (*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>caminho para um ficheiro de configuração personalizado</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>ficheiro-chave da base de dados</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>ler palavra-passe da base de dados a partir de stdin</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation>Gestão da janela parental</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Já está em execução uma instância do KeePassXC.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Erro fatal ao testar as funções de criptografia.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Erro</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation>Palavra-passe da base de dados: </translation>
     </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
     <message>
         <source>Internal zlib error when compressing: </source>
-        <translation>Erro interno zlib durante a compressão:</translation>
+        <translation>Erro interno zlib durante a compressão: </translation>
     </message>
     <message>
         <source>Error writing to underlying device: </source>
-        <translation>Erro de escrita no dispositivo subjacente:</translation>
+        <translation>Erro de escrita no dispositivo subjacente: </translation>
     </message>
     <message>
         <source>Error opening underlying device: </source>
-        <translation>Erro ao abrir o dispositivo subjacente:</translation>
+        <translation>Erro ao abrir o dispositivo subjacente: </translation>
     </message>
     <message>
         <source>Error reading data from underlying device: </source>
-        <translation>Erro de leitura no dispositivo subjacente:</translation>
+        <translation>Erro de leitura no dispositivo subjacente: </translation>
     </message>
     <message>
         <source>Internal zlib error when decompressing: </source>
-        <translation>Erro interno zlib durante a descompressão:</translation>
+        <translation>Erro interno zlib durante a descompressão: </translation>
     </message>
 </context>
 <context>
@@ -3645,16 +4912,102 @@ Comandos disponíveis:
     </message>
     <message>
         <source>Internal zlib error: </source>
-        <translation>Erro interno zlib:</translation>
+        <translation>Erro interno zlib: </translation>
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
+    <message>
+        <source>Agent connection failed.</source>
+        <translation>Erro ao conectar com o agente.</translation>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation>Erro de protocolo do agente.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation>O agente não está em execução e não é possível adicionar a identidade.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation>O agente não está em execução e não é possível remover a identidade.</translation>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation>O agente recusou esta identidade. Causas possíveis:</translation>
+    </message>
     <message>
-        <source>Search...</source>
-        <translation>Pesquisa...</translation>
+        <source>The key has already been added.</source>
+        <translation>A chave já foi adicionada.</translation>
     </message>
     <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation>O tempo de vida restrito não é suportado pelo agente (verificar opções).</translation>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation>O agente não tem suporte a pedidos de confirmação (consulte as opções).</translation>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation>Pesquisar na ajuda</translation>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation>Introduza os termos de pesquisa da seguinte forma: [modificadores][campo:][&quot;]termo[&quot;]</translation>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation>Todos os termos de pesquisa coincidentes (AND lógico)</translation>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation>Modificadores</translation>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation>excluir termo dos resultados</translation>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation>coincidência exata</translation>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation>utilizar regex no termo</translation>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation>Campos</translation>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation>Caracteres universais do termo</translation>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation>coincidência relativa</translation>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation>uma coincidência</translation>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation>OU lógico</translation>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation>Exemplos</translation>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
         <source>Search</source>
         <translation>Pesquisa</translation>
     </message>
@@ -3663,314 +5016,316 @@ Comandos disponíveis:
         <translation>Limpar</translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Maiúsculas/minúsculas</translation>
-    </message>
-    <message>
         <source>Limit search to selected group</source>
         <translation>Limitar pesquisa ao grupo selecionado</translation>
     </message>
+    <message>
+        <source>Search Help</source>
+        <translation>Pesquisar na ajuda</translation>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation>Pesquisa (%1)...</translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation>Sensível ao tipo</translation>
+    </message>
 </context>
 <context>
-    <name>Service</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC: Pedido de associação de nova chave</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation>Recebeu uma pedido de associação para a chave acima.
-Se quiser permitir o acesso à sua base de dados do
-KeePassXC, atribua um nome único para a identificar e aceitar.</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: Substituir chave existente?</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Já existe uma chave de cifra partilhada com o nome &quot;%1&quot;.
-Deseja substituir a chave atual?</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: Atualizar entrada</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Deseja atualizar as informações em %1 - %2?</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Base de dados bloqueada!</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>A base de dados ativa está bloqueada!
-Desbloqueie a base de dados selecionada ou escolha outra que esteja desbloqueada.</translation>
+        <source>Key:</source>
+        <translation>Chave:</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Chaves removidas da base de dados</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation><numerusform>Removidas com sucesso % chave de cifra das definições KeePassX/Http.</numerusform><numerusform>Removidas com sucesso % chaves de cifra das definições KeePassX/Http.</numerusform></translation>
+        <source>Generate</source>
+        <translation>Gerar</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Nenhuma chave encontrada</translation>
+        <source>Import</source>
+        <translation>Importar</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>Não existem chaves de cifra partilhadas nas definições do KeePassHttp.</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Definições indisponíveis!</translation>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>A base de dados ativa não contém uma entrada de definições KeePassHttp.</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>A remover permissões guardadas...</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>Abortar</translation>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Permissões removidas</translation>
+        <source>Remove</source>
+        <translation>Remover</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation><numerusform>Removidas com sucesso as permissões de %n entrada.</numerusform><numerusform>Removidas com sucesso as permissões de %n entradas.</numerusform></translation>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Não existem entradas com permissões!</translation>
+        <source>Status</source>
+        <translation type="unfinished"/>
     </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>
+        <source>Fingerprint</source>
+        <translation>Impressão digital</translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
-        <translation>Definições da aplicação</translation>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Geral</translation>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>Segurança</translation>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>Erro de acesso ao ficheiro %1</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>Definições básicas</translation>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Abrir apenas uma instância do KeepassXC</translation>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>Memorizar últimas bases de dados</translation>
+        <source>All files</source>
+        <translation>Todos os ficheiros</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Memorizar últimos ficheiros-chave e dispositivos de segurança</translation>
+        <source>Select path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Ao iniciar, carregar a última base de dados utilizada</translation>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>Guardar automaticamente ao fechar</translation>
+        <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"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>Guardar automaticamente a cada alteração</translation>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Recarregar base de dados se esta for modificada externamente</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>Minimizar ao copiar para a área de transferência</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Minimizar janela ao iniciar a aplicação</translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>Utilizar ícone do grupo ao criar a entrada</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Não marcar base de dados como alterada para modificações não efetuadas em dados (ex.: expansão de grupos)</translation>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
-        <translation>Ocultar vista de detalhes</translation>
+        <source>Never</source>
+        <translation>Nunca</translation>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>Mostrar ícone na bandeja do sistema</translation>
+        <source>Always</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>Ao minimizar, ocultar a janela na bandeja do sistema</translation>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
-        <translation>Ao fechar, ocultar a janela na bandeja do sistema</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
-        <translation>Ícone escuro na bandeja</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Idioma</translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Escrita automática</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>Utilizar título da entrada para fazer coincidir com a escrita automática</translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>Utilizar URL da entrada para fazer coincidir com a escrita automática</translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation>Perguntar antes de executar a escrita automática</translation>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Atalho global de escrita automática</translation>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>Atraso de escrita automática</translation>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation> ms</translation>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
-        <translation>Arranque</translation>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
-        <translation>Gestão de ficheiros</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation>Guardar bases de dados em segurança (pode ser incompatível com DropBox e outros serviços)</translation>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
-        <translation>Criar backup da base de dados antes de guardar</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
-        <translation>Gestão de entradas</translation>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Geral</translation>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
-        <translation>Tempo limite</translation>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>Limpar área de transferência após</translation>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> seg.</translation>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>Bloquear base de dados se inativa durante</translation>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Conveniência</translation>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Bloquear base de dados ao bloquear a sessão ou ao fechar a tampa do portátil</translation>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>Bloquear base de dados ao minimizar a janela</translation>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>TotpDialog</name>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>Não pedir repetição da palavra-passe se esta estiver visível</translation>
+        <source>Timed Password</source>
+        <translation>Palavra-passe limitada</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Mostrar palavras-passe em texto simples</translation>
+        <source>000000</source>
+        <translation>000000</translation>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
-        <translation>Ocultar palavras-passe no painel de pré-visualização</translation>
+        <source>Copy</source>
+        <translation>Copiar</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 em &lt;b&gt;%n&lt;/b&gt; segundos</numerusform></translation>
     </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
     <message>
-        <source>Hide entry notes by default</source>
-        <translation>Por definição, ocultar notas da entrada</translation>
+        <source>Copy</source>
+        <translation>Copiar</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>Privacidade</translation>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation>Nota: estas definições TOTP são personalizadas e podem não funcionar com outros autenticadores.</translation>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>Utilizar o Google como recurso para descarregar os ícones dos sites</translation>
+        <source>There was an error creating the QR code.</source>
+        <translation>Ocorreu um erro ao criar o código QR.</translation>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
-        <translation>Bloquear novamente a base de dados depois de usar a escrita automática</translation>
+        <source>Closing in %1 seconds.</source>
+        <translation>A fechar dentro de %1 segundos.</translation>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation>Configurar TOTP</translation>
@@ -3989,62 +5344,87 @@ Desbloqueie a base de dados selecionada ou escolha outra que esteja desbloqueada
     </message>
     <message>
         <source>Use custom settings</source>
-        <translation>Usar definições personalizadas</translation>
+        <translation>Utilizar definições personalizadas</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>Nota: apenas deve alterar estas definições se souber o que está a fazer.</translation>
+        <source>Custom Settings</source>
+        <translation>Definições personalizadas</translation>
     </message>
     <message>
         <source>Time step:</source>
         <translation>Avanço de tempo:</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8 dígitos</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> seg</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>Tamanho do código:</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6 dígitos</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>Tamanho do código:</translation>
+        <source>7 digits</source>
+        <translation>7 dígitos</translation>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> seg.</translation>
+        <source>8 digits</source>
+        <translation>8 dígitos</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>Palavra-passe limitada</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Copiar</translation>
+        <source>Close</source>
+        <translation>Fechar</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>Expira em</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>segundos</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>Desbloquear base de dados</translation>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4079,42 +5459,26 @@ Desbloqueie a base de dados selecionada ou escolha outra que esteja desbloqueada
     </message>
 </context>
 <context>
-    <name>main</name>
-    <message>
-        <source>Remove an entry from the database.</source>
-        <translation>Remover uma entrada da base de dados.</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>Caminho da base de dados.</translation>
-    </message>
-    <message>
-        <source>Path of the entry to remove.</source>
-        <translation>Caminho da entrada a remover.</translation>
-    </message>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - Gestor de palavras-passe multi-plataforma</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>nome de ficheiro das bases de dados a abrir (*.kdbx)</translation>
+        <source>Refresh</source>
+        <translation>Recarregar</translation>
     </message>
     <message>
-        <source>path to a custom config file</source>
-        <translation>caminho para um ficheiro de configuração personalizado</translation>
+        <source>YubiKey Challenge-Response</source>
+        <translation>Pergunta de segurança YubiKey</translation>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>ficheiro-chave da base de dados</translation>
+        <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>&lt;p&gt;Se você tiver uma &lt;a href=&quot;https://www.yubico.com/&quot;&gt;YubiKey&lt;/a&gt;, pode utiliza-la para obter mais segurança.&lt;/p&gt;&lt;p&gt;A YubiKey requer que uma das suas ranhuras seja programada como uma &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;</translation>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>ler palavra-passe da base de dados a partir de stdin</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation>Yubikey não detetada. verifique se está inserida corretamente.</translation>
     </message>
     <message>
-        <source>Parent window handle</source>
-        <translation>Gestão da janela parental</translation>
+        <source>No YubiKey inserted.</source>
+        <translation>Youbikey não inserida.</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_ro.ts b/share/translations/keepassx_ro.ts
index ded0193bd..c6dfda993 100644
--- a/share/translations/keepassx_ro.ts
+++ b/share/translations/keepassx_ro.ts
@@ -38,12 +38,6 @@
         <translation>Copiază în clipboard</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>Versiunea %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>Revizie: %1</translation>
     </message>
@@ -76,32 +70,47 @@ Nucleu (Kernel): %3 %4</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
+        <source>Version %1</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
+        <source>Build Type: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>Ține minte această decizie</translation>
+        <source>Auto-Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Permite</translation>
+        <source>Browser Integration</source>
+        <translation>Integrare cu browserul</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>Interzice</translation>
+        <source>SSH Agent</source>
+        <translation>Agent SSH</translation>
     </message>
     <message>
-        <source>%1 has requested access to passwords for the following item(s).
-Please select whether you want to allow access.</source>
+        <source>YubiKey</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -111,6 +120,277 @@ Please select whether you want to allow access.</source>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>Activează Agentul SSH (necesită repornire)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Setări aplicație</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Securitate</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Setări de bază</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Memorează ultimele baze de date</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Salvare automată la ieșire</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Limbă</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation> ms</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>Golește clipboard după</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> sec</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>Comoditate</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>Confidențialitate</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -213,6 +493,26 @@ Please select whether you want to allow access.</source>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Anulare</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -286,14 +586,6 @@ Please select whether you want to allow access.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>Avansat</translation>
     </message>
@@ -359,14 +651,6 @@ Please select whether you want to allow access.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>Fișiere Executabile (*.exe);;Toate Fișierele (*.*)</translation>
-    </message>
-    <message>
-        <source>Executable Files (*)</source>
-        <translation>Fișiere Executabile (*)</translation>
-    </message>
-    <message>
         <source>Select custom proxy location</source>
         <translation type="unfinished"/>
     </message>
@@ -374,76 +658,64 @@ Please select whether you want to allow access.</source>
         <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>BrowserService</name>
     <message>
-        <source>KeePassXC: New key association request</source>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-
-If you would like to allow it access to your KeePassXC database,
-give it a unique name to identify and accept it.</source>
+        <source>&amp;Tor Browser</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save and allow access</source>
-        <translation>Salvează și permite acces</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: Suprascriere cheie existentă?</translation>
-    </message>
-    <message>
-        <source>A shared encryption key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
+        <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: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
+        <source>Executable Files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
+        <source>All Files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
+        <source>Do not ask permission for HTTP &amp;Basic Auth</source>
+        <extracomment>An extra HTTP Basic Auth setting</extracomment>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>BrowserService</name>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
+        <source>KeePassXC: New key association request</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation type="unfinished"/>
+        <source>Save and allow access</source>
+        <translation>Salvează și permite acces</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation type="unfinished"/>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: Suprascriere cheie existentă?</translation>
     </message>
     <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
+        <source>KeePassXC: Update Entry</source>
         <translation type="unfinished"/>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
-    </message>
     <message>
-        <source>Removing stored permissions…</source>
+        <source>Do you want to update the information in %1 - %2?</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -451,106 +723,38 @@ Please unlock the selected database or choose another one which is unlocked.</so
         <translation>Anulează</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
+        <source>Converting attributes to custom data…</source>
         <translation type="unfinished"/>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>Parolă</translation>
-    </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>Introdu parola:</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>Repetă parola:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>Răsfoiește</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Creează</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Actualizează</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>Fișiere cheie</translation>
-    </message>
     <message>
-        <source>All files</source>
-        <translation>Toate fișierele</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>Creare fișier cheie...</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Select a key file</source>
-        <translation>Selectați un fișier cheie</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Parolă vidă</translation>
-    </message>
-    <message>
-        <source>Do you really want to use an empty string as password?</source>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>Au fost introduse parole diferite.</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Legacy key file format</source>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
         <translation type="unfinished"/>
     </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>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -632,14 +836,6 @@ Please consider generating a new key file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>Denumire câmp vidă</translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>coloană</translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>Importat din fișier CSV</translation>
     </message>
@@ -648,50 +844,87 @@ Please consider generating a new key file.</source>
         <translation>Datele originale: </translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation type="unfinished"/>
+        <source>Error</source>
+        <translation>Eroare</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
+        <source>Empty fieldname %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Eroare</translation>
+        <source>column %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
+        <source>Error(s) detected in CSV file!</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>Eroare</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Nu a putut fi calculată cheia principală</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
+        <source>%n column(s)</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
+        <source>%n byte(s)</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
+        <source>%n row(s)</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Rădăcină</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DatabaseOpenWidget</name>
     <message>
         <source>Enter master key</source>
@@ -718,14 +951,6 @@ Please consider generating a new key file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Nu pot deschide baza de date.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Fișierul cheie nu a putut fi deschis</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation type="unfinished"/>
     </message>
@@ -752,101 +977,169 @@ Please consider generating a new key file.</source>
         <source>Select key file</source>
         <translation>Selectați fișier cheie</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>Repară baza de date</translation>
+        <source>TouchID for quick unlock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Eroare</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Fișierul cheie nu a putut fi deschis</translation>
+        <source>Can't open key file:
+%1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Nu pot deschide baza de date.</translation>
+        <source>Passwords</source>
+        <translation>Parole</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
+        <source>Advanced Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Success</source>
-        <translation>Succes</translation>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Securitate</translation>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
+        <source>Master Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>Baza de date nu poate fi reparată.</translation>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation>Integrare cu browserul</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>General</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>Criptare</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
+        <source>Forg&amp;et all site-specific settings on entries</source>
         <translation type="unfinished"/>
     </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>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Understood, keep number</source>
+        <source>Stored keys</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>Anulare</translation>
+        <source>Remove</source>
+        <translation> Înlătură</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
+        <source>Delete the selected key?</source>
         <translation type="unfinished"/>
     </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>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KDF unchanged</source>
+        <source>Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Anulează</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
+        <source>Successfully removed permissions from %n entry(s).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetEncryption</name>
@@ -882,6 +1175,109 @@ If you keep this number, your database may be too easy to crack!</source>
         <source>Parallelism:</source>
         <translation>Paralelism:</translation>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Anulare</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -931,90 +1327,110 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>Rădăcină</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Bază de date KeePass 2</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Toate fișierele</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Deschide baza de date</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation> Fișierul nu a fost găsit</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Nu pot deschide baza de date.</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>Fișier deschis doar pentru citire.</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>Deschide fișier CSV</translation>
+        <source>Add additional protection...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>Fișier CSV</translation>
+        <source>No encryption key added</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>Toate fișierele (*)</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Îmbină baza de date</translation>
+        <source>No password set</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Deschide bază de date KeePass 1</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 type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>Bază de date KeePass 1</translation>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>Închidere?</translation>
+        <source>Failed to change master key</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
+        <source>Database Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>Salvare modificări?</translation>
+        <source>Description:</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>&quot;%1&quot; a fost modificat.
-Salvați modificările?</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Bază de date KeePass 2</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Scrierea în baza de date a eșuat.</translation>
+        <source>All files</source>
+        <translation>Toate fișierele</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Parole</translation>
+        <source>Open database</source>
+        <translation>Deschide baza de date</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Salvează bază de date ca</translation>
+        <source>CSV file</source>
+        <translation>Fișier CSV</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>Îmbină baza de date</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Deschide bază de date KeePass 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>Bază de date KeePass 1</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1025,35 +1441,39 @@ Salvați modificările?</translation>
         <translation>Scrierea în fișierul CSV a eșuat.</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>Bază de date nouă</translation>
+        <source>Database creation error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>locked</source>
-        <translation>blocat</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 type="unfinished"/>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>Blocare bază de date</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
+        <source>Select CSV file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
+        <source>New Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disable safe saves?</source>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
         <translation type="unfinished"/>
     </message>
     <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>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1064,37 +1484,13 @@ Disable safe saves and try again?</source>
         <translation>Căutare...</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>Modifică cheia principală</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>Stergeți intrarea?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Ștergeți intrările?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Mutați intrarea în coșul de gunoi?</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Mutați intrările în coșul de gunoi?</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -1112,18 +1508,10 @@ Disable safe saves and try again?</source>
         <translation>Ține minte alegerea mea</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Ștergeți grupul?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Nu a putut fi calculată cheia principală</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>Nu există o baza de date curentă.</translation>
     </message>
@@ -1157,10 +1545,6 @@ Do you want to merge your changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>Goliți coșul de gunoi?</translation>
     </message>
@@ -1168,88 +1552,103 @@ Do you want to merge your changes?</source>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>Genereaza token TOTP</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Închide</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Fișier deschis doar pentru citire.</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>General</translation>
+        <source>Lock Database?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Parolă</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot; a fost modificat.
+Salvați modificările?</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>Expirare</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Nume utilizator</translation>
+        <source>Save changes?</source>
+        <translation>Salvare modificări?</translation>
     </message>
     <message>
-        <source>Autotype</source>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>Căutare</translation>
+        <source>Disable safe saves?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>Atribute</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Atașamente</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Notițe</translation>
+        <source>Passwords</source>
+        <translation>Parole</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>Fereastră</translation>
+        <source>Save database as</source>
+        <translation>Salvează bază de date ca</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>Secvență</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Bază de date KeePass 2</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Caută</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Golește</translation>
+        <source>Delete group</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Never</source>
-        <translation>Niciodată</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[PROTEJAT]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>Dezactivat</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Activat</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1323,22 +1722,10 @@ Do you want to merge your changes?</source>
         <translation>Atribut nou</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Confirmați înlăturarea</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>Sunteți sigur că doriți să eliminați acest atribut?</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[PROTEJAT]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>Mâine</translation>
     </message>
@@ -1351,10 +1738,6 @@ Do you want to merge your changes?</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 an</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation type="unfinished"/>
     </message>
@@ -1366,6 +1749,26 @@ Do you want to merge your changes?</source>
         <source>Entry updated successfully.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1611,6 +2014,81 @@ Do you want to merge your changes?</source>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>Formular</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Parola:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1668,10 +2146,6 @@ Do you want to merge your changes?</source>
         <translation>Nu pot descărca favicon.</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Images</source>
         <translation>Imagini</translation>
     </message>
@@ -1680,14 +2154,6 @@ Do you want to merge your changes?</source>
         <translation>Toate fișierele</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Selectați imagine</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read icon</source>
-        <translation>Nu pot citi icon</translation>
-    </message>
-    <message>
         <source>Custom icon already exists</source>
         <translation>Icon personalizat deja există</translation>
     </message>
@@ -1696,9 +2162,37 @@ Do you want to merge your changes?</source>
         <translation>Confirmați ștergerea</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
+        <source>Custom icon successfully downloaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>
@@ -1747,8 +2241,7 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
+        <source>%1 - Clone</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1794,10 +2287,6 @@ This may cause the affected plugins to malfunction.</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Confirmați înlăturarea</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>Salvați atașamentele</translation>
     </message>
@@ -1830,10 +2319,14 @@ This may cause the affected plugins to malfunction.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open files:
-%1</source>
+        <source>Confirm remove</source>
         <translation type="unfinished"/>
     </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
+%1</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
 </context>
 <context>
     <name>EntryAttributesModel</name>
@@ -1916,108 +2409,166 @@ This may cause the affected plugins to malfunction.</source>
         <source>Attachments</source>
         <translation>Atașamente</translation>
     </message>
-</context>
-<context>
-    <name>EntryView</name>
     <message>
-        <source>Customize View</source>
+        <source>Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide Usernames</source>
+        <source>TOTP</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
     <message>
-        <source>Hide Passwords</source>
-        <translation type="unfinished"/>
+        <source>Generate TOTP Token</source>
+        <translation>Generează token TOTP</translation>
     </message>
     <message>
-        <source>Fit to window</source>
-        <translation type="unfinished"/>
+        <source>Close</source>
+        <translation>Închide</translation>
     </message>
     <message>
-        <source>Fit to contents</source>
-        <translation type="unfinished"/>
+        <source>General</source>
+        <translation>General</translation>
     </message>
     <message>
-        <source>Reset to defaults</source>
+        <source>Username</source>
+        <translation>Nume utilizator</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Parola</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Expirare</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>Atribute</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Atașamente</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notițe</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Attachments (icon)</source>
-        <translation>Atașamente (icon)</translation>
+        <source>Window</source>
+        <translation>Fereastră</translation>
     </message>
-</context>
-<context>
-    <name>Group</name>
     <message>
-        <source>Recycle Bin</source>
-        <translation>Coș de gunoi</translation>
+        <source>Sequence</source>
+        <translation>Secvență</translation>
     </message>
-</context>
-<context>
-    <name>HostInstaller</name>
     <message>
-        <source>KeePassXC: Cannot save file!</source>
+        <source>Searching</source>
+        <translation>Căutare</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Caută</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Golește</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Niciodată</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[PROTEJAT]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot save the native messaging script file.</source>
+        <source>Enabled</source>
+        <translation>Activat</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Dezactivat</translation>
+    </message>
+    <message>
+        <source>Share</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>Lungime:</translation>
-    </message>
+    <name>EntryView</name>
     <message>
-        <source>Character Types</source>
-        <translation>Tipuri de caractere</translation>
+        <source>Customize View</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Upper Case Letters</source>
-        <translation>Litere mari</translation>
+        <source>Hide Usernames</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
+        <source>Hide Passwords</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lower Case Letters</source>
-        <translation>Litere mici</translation>
+        <source>Fit to window</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
+        <source>Fit to contents</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Numbers</source>
-        <translation>Numere</translation>
+        <source>Reset to defaults</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
+        <source>Attachments (icon)</source>
+        <translation>Atașamente (icon)</translation>
     </message>
+</context>
+<context>
+    <name>Group</name>
     <message>
-        <source>Special Characters</source>
-        <translation>Caractere speciale</translation>
+        <source>Recycle Bin</source>
+        <translation>Coș de gunoi</translation>
     </message>
     <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>GroupModel</name>
     <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Exclude caractere asemănătoare</translation>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>HostInstaller</name>
     <message>
-        <source>Ensure that the password contains characters from every group</source>
+        <source>KeePassXC: Cannot save file!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extended ASCII</source>
+        <source>Cannot save the native messaging script file.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -2046,6 +2597,26 @@ This may cause the affected plugins to malfunction.</source>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Cheie greșită sau fișier bază de date corupt.</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2205,10 +2776,6 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation type="unfinished"/>
     </message>
@@ -2259,6 +2826,18 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Unsupported KeePass 2 database version.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2331,10 +2910,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation type="unfinished"/>
     </message>
@@ -2383,6 +2958,12 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2546,58 +3127,144 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Invalid entry field type</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <source>Disabled share</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <source>Import from</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
+        <source>Export to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
+    <message>
+        <source>Key Component</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Eroare</translation>
+        <source>Key Component Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Anulare</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>KeyFileEditWidget</name>
     <message>
-        <source>&amp;Database</source>
+        <source>Browse</source>
+        <translation>Răsfoiește</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Generează</translation>
+    </message>
+    <message>
+        <source>Key File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Recent databases</source>
+        <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"/>
     </message>
     <message>
-        <source>Import</source>
+        <source>Legacy key file format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Help</source>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>E&amp;ntries</source>
+        <source>Error loading the key file '%1'
+Message: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
+        <source>Key files</source>
+        <translation>Fișiere cheie</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Toate fișierele</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Creare fișier cheie...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Time-based one-time password</source>
+        <source>Unable to create key file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Selectați un fișier cheie</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Recent databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>E&amp;ntries</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2629,429 +3296,512 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;New database</source>
+        <source>&amp;Delete entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge from KeePassX database</source>
-        <translation>Îmbină dintr-o bază de date KeePass</translation>
+        <source>&amp;Edit group</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Add new entry</source>
+        <source>&amp;Delete group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;View/Edit entry</source>
+        <source>Sa&amp;ve database as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Delete entry</source>
+        <source>Database settings</source>
+        <translation>Setări bază de date</translation>
+    </message>
+    <message>
+        <source>&amp;Clone entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Add new group</source>
+        <source>Copy &amp;username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Edit group</source>
+        <source>Copy username to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Delete group</source>
+        <source>Copy password to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sa&amp;ve database as...</source>
+        <source>&amp;Settings</source>
+        <translation>&amp;Setări</translation>
+    </message>
+    <message>
+        <source>Password Generator</source>
+        <translation>Generator de parole</translation>
+    </message>
+    <message>
+        <source>&amp;Lock databases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
+        <source>&amp;Title</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Database settings</source>
+        <source>Copy title to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Database settings</source>
-        <translation>Setări bază de date</translation>
+        <source>&amp;URL</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Clone entry</source>
+        <source>Copy URL to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Find</source>
+        <source>&amp;Notes</source>
+        <translation>&amp;Notițe</translation>
+    </message>
+    <message>
+        <source>Copy notes to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy &amp;username</source>
+        <source>&amp;Export to CSV file...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy username to clipboard</source>
+        <source>Set up TOTP...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
+        <source>Copy &amp;TOTP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy password to clipboard</source>
+        <source>E&amp;mpty recycle bin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Settings</source>
-        <translation>&amp;Setări</translation>
+        <source>Clear history</source>
+        <translation>Golește istoric</translation>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>Generator de parole</translation>
+        <source>Access error for config file %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
+        <source>Settings</source>
+        <translation>Setări</translation>
+    </message>
+    <message>
+        <source>Toggle window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Open URL</source>
+        <source>Quit KeePassXC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Lock databases</source>
+        <source>Please touch the button on your YubiKey!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Title</source>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy title to clipboard</source>
+        <source>&amp;Donate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;URL</source>
+        <source>Report a &amp;bug</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy URL to clipboard</source>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Notes</source>
-        <translation>&amp;Notițe</translation>
+        <source>&amp;Import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy notes to clipboard</source>
+        <source>Copy att&amp;ribute...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Export to CSV file...</source>
+        <source>TOTP...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Importă bază de date KeePass 1...</translation>
+        <source>&amp;New database...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import CSV file...</source>
-        <translation>Importă fișier CSV...</translation>
+        <source>Create a new database</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;pair database...</source>
+        <source>&amp;Merge from database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show TOTP</source>
+        <source>Merge from another KDBX database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Set up TOTP...</source>
+        <source>&amp;New entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
+        <source>Add a new entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>E&amp;mpty recycle bin</source>
+        <source>&amp;Edit entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear history</source>
-        <translation>Golește istoric</translation>
+        <source>View or edit entry</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
+        <source>&amp;New group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
+        <source>Add a new group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>read-only</source>
+        <source>Change master &amp;key...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Setări</translation>
+        <source>&amp;Database settings...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Toggle window</source>
+        <source>Copy &amp;password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Quit KeePassXC</source>
+        <source>Perform &amp;Auto-Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Bază de date KeePass 2</translation>
+        <source>Open &amp;URL</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Toate fișierele</translation>
+        <source>KeePass 1 database...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Deschide baza de date</translation>
+        <source>Import a KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Salvează bază de date reparată</translation>
+        <source>Import a CSV file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Scrierea în baza de date a eșuat.</translation>
+        <source>Show TOTP...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
+        <source>Show TOTP QR Code...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>OpenSSHKey</name>
+    <name>Merger</name>
     <message>
-        <source>Invalid key file, expecting an OpenSSH key</source>
+        <source>Creating missing %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>PEM boundary mismatch</source>
+        <source>Relocating %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Base64 decoding failed</source>
+        <source>Overwriting %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key file way too small.</source>
+        <source>older entry merged from database &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key file magic header id invalid</source>
+        <source>Adding backup for older target %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Found zero keys</source>
+        <source>Adding backup for older source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to read public key.</source>
-        <translation>Citirea cheii publice a eșuat.</translation>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Corrupted key file, reading private key failed</source>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>No private key payload to decrypt</source>
+        <source>Synchronizing from newer source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Trying to run KDF without cipher</source>
+        <source>Synchronizing from older source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase is required to decrypt this key</source>
+        <source>Deleting child %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key derivation failed, key file corrupted?</source>
+        <source>Deleting orphan %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Decryption failed, wrong passphrase?</source>
+        <source>Changed deleted objects</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unexpected EOF while reading public key</source>
+        <source>Adding missing icon %1</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
     <message>
-        <source>Unexpected EOF while reading private key</source>
+        <source>Create a new KeePassXC database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t write public key as it is empty</source>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Rădăcină</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unexpected EOF when writing public key</source>
+        <source>En&amp;cryption Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t write private key as it is empty</source>
+        <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"/>
     </message>
     <message>
-        <source>Unexpected EOF when writing private key</source>
+        <source>Advanced Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported key type: %1</source>
+        <source>Simple Settings</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
     <message>
-        <source>Unknown cipher: %1</source>
+        <source>Encryption Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cipher IV is too short for MD5 kdf</source>
+        <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"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
     <message>
-        <source>Unknown KDF: %1</source>
+        <source>Database Master Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unknown key type: %1</source>
+        <source>A master key known only to you protects your database.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>NewDatabaseWizardPageMetaData</name>
     <message>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
+        <source>General Database Information</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
+        <source>Please fill in the display name and an optional description for your new database:</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>Actvați serverul KeePassHTTP</translation>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>General</translation>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <source>Base64 decoding failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <source>Key file way too small.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return only best matching entries</source>
+        <source>Key file magic header id invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <source>Found zero keys</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
+        <source>Failed to read public key.</source>
+        <translation>Citirea cheii publice a eșuat.</translation>
+    </message>
+    <message>
+        <source>Corrupted key file, reading private key failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Match URL schemes</source>
+        <source>No private key payload to decrypt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
+        <source>Trying to run KDF without cipher</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
+        <source>Passphrase is required to decrypt this key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
+        <source>Key derivation failed, key file corrupted?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <source>Decryption failed, wrong passphrase?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>Generator de parole</translation>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Avansat</translation>
+        <source>Unexpected EOF while reading private key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
+        <source>Can&apos;t write public key as it is empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
+        <source>Unexpected EOF when writing public key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only the selected database has to be connected with a client.</source>
+        <source>Can&apos;t write private key as it is empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <source>Unexpected EOF when writing private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
+        <source>Unsupported key type: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <source>Unknown cipher: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>Port HTTP:</translation>
+        <source>Cipher IV is too short for MD5 kdf</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Port implicit: 19455</translation>
+        <source>Unknown KDF: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <source>Unknown key type: %1</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <source>Enter password:</source>
+        <translation>Introdu parola:</translation>
+    </message>
+    <message>
+        <source>Confirm password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <source>Password</source>
+        <translation>Parola</translation>
+    </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"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
+        <source>Password cannot be empty.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
+        <source>Passwords do not match.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate master password</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -3123,18 +3873,10 @@ Using default port 19455.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Număr cuvinte:</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>Separator cuvinte:</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>Generează</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Copiază</translation>
     </message>
@@ -3147,10 +3889,6 @@ Using default port 19455.</source>
         <translation>Închide</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>Aplică</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>Entropie: %1 bit</translation>
     </message>
@@ -3178,51 +3916,200 @@ Using default port 19455.</source>
         <comment>Password quality</comment>
         <translation>Excelent</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Avansat</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>QObject</name>
+    <name>QApplication</name>
     <message>
-        <source>Database not opened</source>
+        <source>KeeShare</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>QFileDialog</name>
     <message>
-        <source>Database hash not available</source>
+        <source>Select</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>QMessageBox</name>
     <message>
-        <source>Client public key not received</source>
+        <source>Overwrite</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot decrypt message</source>
+        <source>Delete</source>
+        <translation>Șterge</translation>
+    </message>
+    <message>
+        <source>Move</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
+        <source>Empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Action cancelled or denied</source>
+        <source>Remove</source>
+        <translation> Înlătură</translation>
+    </message>
+    <message>
+        <source>Skip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <source>Disable</source>
+        <translation>Dezactivează</translation>
+    </message>
+    <message>
+        <source>Merge</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>KeePassXC association failed, try again</source>
+        <source>Database not opened</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key change was not successful</source>
+        <source>Database hash not available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Encryption key is not recognized</source>
+        <source>Client public key not received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>No saved databases found</source>
+        <source>Cannot decrypt message</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -3351,10 +4238,6 @@ Using default port 19455.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3436,12 +4319,6 @@ Comenzi disponibile:
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>fișier vid!
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation type="unfinished"/>
     </message>
@@ -3450,6 +4327,371 @@ Comenzi disponibile:
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Group</source>
+        <translation>Grup</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Titlu</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Nume utilizator</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Parolă</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notițe</translation>
+    </message>
+    <message>
+        <source>Last Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation>Integrare cu browserul</translation>
+    </message>
+    <message>
+        <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Press</source>
+        <translation>Apasă</translation>
+    </message>
+    <message>
+        <source>Passive</source>
+        <translation>Pasiv</translation>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation>Agent SSH</translation>
+    </message>
+    <message>
+        <source>Generate a new random diceware passphrase.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word count for the diceware passphrase.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wordlist for the diceware generator.
+[Default: EFF English]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new random password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>AES: 256-bit</source>
         <translation type="unfinished"/>
     </message>
@@ -3474,100 +4716,113 @@ Comenzi disponibile:
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Group</source>
-        <translation>Grup</translation>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Title</source>
-        <translation>Titlu</translation>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Nume utilizator</translation>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Parolă</translation>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Notițe</translation>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Last Modified</source>
+        <source>File %1 already exists.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Created</source>
+        <source>Loading the key file failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
+        <source>No key is set. Aborting database creation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Browser Integration</source>
-        <translation>Integrare cu browserul</translation>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
+        <source>Successfully created new database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Press</source>
-        <translation>Apasă</translation>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passive</source>
-        <translation>Pasiv</translation>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>SSH Agent</source>
-        <translation>Agent SSH</translation>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Generate a new random diceware passphrase.</source>
+        <source>Remove an entry from the database.</source>
+        <translation>Eliminați o intrare din baza de date.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word count for the diceware passphrase.</source>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>count</source>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist for the diceware generator.
-[Default: EFF English]</source>
+        <source>KeePassXC - cross-platform password manager</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Generate a new random password.</source>
+        <source>filenames of the password databases to open (*.kdbx)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Length of the generated password.</source>
+        <source>path to a custom config file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
+        <source>key file of the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
+        <source>read password of the database from stdin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
+        <source>Parent window handle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
+        <source>Another instance of KeePassXC is already running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Eroare</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -3606,324 +4861,416 @@ Comenzi disponibile:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
     <message>
-        <source>Search...</source>
-        <translation>Caută...</translation>
+        <source>Agent connection failed.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Caută</translation>
+        <source>Agent protocol error.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Golește</translation>
+        <source>No agent running, cannot add identity.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Case Sensitive</source>
+        <source>No agent running, cannot remove identity.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Limit search to selected group</source>
-        <translation>Limitați căutarea la grupul selectat</translation>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>Service</name>
+    <name>SearchHelpWidget</name>
     <message>
-        <source>KeePassXC: New key association request</source>
+        <source>Search Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: Suprascriere cheie existentă?</translation>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
+        <source>Modifiers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
+        <source>exclude term from results</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
+        <source>match term exactly</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
+        <source>use regex in term</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
+        <source>Fields</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
+        <source>Term Wildcards</source>
         <translation type="unfinished"/>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    <message>
+        <source>match anything</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
+        <source>match one</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <source>logical OR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
+        <source>Examples</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
+        <source>Search</source>
+        <translation>Caută</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Golește</translation>
+    </message>
+    <message>
+        <source>Limit search to selected group</source>
+        <translation>Limitați căutarea la grupul selectat</translation>
+    </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <source>Search Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>Anulează</translation>
+        <source>Case sensitive</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>KeePassXC: Removed permissions</source>
+        <source>Active</source>
         <translation type="unfinished"/>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    <message>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
+        <source>Allow import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
+        <source>Own certificate</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
-        <translation>Setări aplicație</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>General</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>Securitate</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
+        <source>Key:</source>
+        <translation>Cheie:</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Generează</translation>
+    </message>
+    <message>
+        <source>Import</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>Setări de bază</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
+        <source>Imported certificates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>Memorează ultimele baze de date</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
+        <source>Ask</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
+        <source>Untrust</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>Salvare automată la ieșire</translation>
+        <source>Remove</source>
+        <translation> Înlătură</translation>
     </message>
     <message>
-        <source>Automatically save after every change</source>
+        <source>Path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically reload the database when modified externally</source>
+        <source>Status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
+        <source>Fingerprint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
+        <source>Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
+        <source>Trusted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <source>Untrusted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
+        <source>Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show a system tray icon</source>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
+        <source>KeeShare key file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
+        <source>All files</source>
+        <translation>Toate fișierele</translation>
+    </message>
+    <message>
+        <source>Select path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
+        <source>Exporting changed certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Limbă</translation>
+        <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"/>
     </message>
     <message>
-        <source>Auto-Type</source>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
+        <source>Import from container without signature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
+        <source>Import from container with certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
+        <source>Not this time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation> ms</translation>
+        <source>Never</source>
+        <translation>Niciodată</translation>
     </message>
     <message>
-        <source>Startup</source>
+        <source>Always</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
+        <source>Just this time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <source>Import from %1 failed (%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
+        <source>Import from %1 successful (%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
+        <source>Imported from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>General</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
+        <source>File is not readable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>Golește clipboard după</translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> sec</translation>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
+        <source>Successful signed import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Comoditate</translation>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
+        <source>Unsigned share container are not supported - import prevented</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
+        <source>Successful unsigned import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
+        <source>File does not exist</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
+        <source>Unknown share container type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
+        <source>Overwriting signed share container is not supported - export prevented</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide entry notes by default</source>
+        <source>Could not write export container (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>Confidențialitate</translation>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>Folosește Google ca variantă de rezervă pentru descărcare favicon site</translation>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpDialog</name>
+    <message>
+        <source>Timed Password</source>
+        <translation>Parolă temporizată</translation>
+    </message>
+    <message>
+        <source>000000</source>
+        <translation>000000</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Copiază</translation>
+    </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></translation>
+    </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
+    <message>
+        <source>Copy</source>
+        <translation>Copiază</translation>
+    </message>
+    <message>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>There was an error creating the QR code.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Closing in %1 seconds.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation>Configurați TOTP</translation>
@@ -3945,7 +5292,7 @@ Please unlock the selected database or choose another one which is unlocked.</so
         <translation>Utilizați setările personalizate</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
+        <source>Custom Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -3953,51 +5300,76 @@ Please unlock the selected database or choose another one which is unlocked.</so
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8 cifre</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> sec</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>Dimensiune cod:</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6 cifre</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>Dimensiune cod:</translation>
+        <source>7 digits</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> sec</translation>
+        <source>8 digits</source>
+        <translation>8 cifre</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>Parolă temporizată</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Copiază</translation>
+        <source>Close</source>
+        <translation>Închide</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>Expiră în</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>secunde</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>Deblocare bază de date</translation>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4032,41 +5404,25 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
 </context>
 <context>
-    <name>main</name>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>Remove an entry from the database.</source>
-        <translation>Eliminați o intrare din baza de date.</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>Calea către baza de date</translation>
-    </message>
-    <message>
-        <source>Path of the entry to remove.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation type="unfinished"/>
+        <source>Refresh</source>
+        <translation>Actualizează</translation>
     </message>
     <message>
-        <source>path to a custom config file</source>
+        <source>YubiKey Challenge-Response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>key file of the database</source>
+        <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"/>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Parent window handle</source>
+        <source>No YubiKey inserted.</source>
         <translation type="unfinished"/>
     </message>
 </context>
diff --git a/share/translations/keepassx_ru.ts b/share/translations/keepassx_ru.ts
index 45810522b..b585841bd 100644
--- a/share/translations/keepassx_ru.ts
+++ b/share/translations/keepassx_ru.ts
@@ -38,12 +38,6 @@
         <translation>Скопировать в буфер обмена</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>Версия %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>Ревизия: %1</translation>
     </message>
@@ -76,35 +70,48 @@ Kernel: %3 %4</source>
         <translation>Команда KeePassXC выражает особую благодарность debfx за создание оригинального KeePassX.</translation>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
-        <translation>Тип сборки: %1
-</translation>
+        <source>Version %1</source>
+        <translation>Версия %1</translation>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>Подтверждение доступа к KeePassXC HTTP</translation>
+        <source>Build Type: %1</source>
+        <translation>Тип сборки: %1</translation>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>Запомнить это решение</translation>
+        <source>Auto-Type</source>
+        <translation>Автоввод</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Разрешить</translation>
+        <source>Browser Integration</source>
+        <translation>Интеграция с браузером</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>Запретить</translation>
+        <source>SSH Agent</source>
+        <translation>SSH-агент</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>%1 запросил доступ к паролям для следующих элементов.
-Разрешить доступ?</translation>
+        <source>YubiKey</source>
+        <translation>YubiKey</translation>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation>TouchID</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Нет</translation>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -113,6 +120,277 @@ Please select whether you want to allow access.</source>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>Включить SSH-агент (необходим перезапуск)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Параметры приложения</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Общие</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Безопасность</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Ошибка доступа к файлу конфигурации %1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Основные параметры</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>Запуск</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Запускать только один экземпляр KeePassXC</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Запоминать последнюю базу данных</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Запоминать последние использованные ключевые файлы и устройства</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Загружать предыдущие базы данных при запуске</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>Сворачивать окно при запуске приложения</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>Управление файлами</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation>Безопасное сохранение файлов базы данных (возможна несовместимость с Dropbox и др.)</translation>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation>Создавать резервную копию базы данных перед сохранением</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Автоматически сохранять после каждого изменения</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Автоматически сохранять при выходе</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Не помечать базу данных изменённой при действиях, не связанных с изменением данных (например при распахивании групп)</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Автоматически перезагружать базу данных при её изменении извне</translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>Управление записями</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>Использовать значок группы для новых записей</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Сворачивать при копировании в буфер обмена</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation>Скрыть панель предварительного просмотра записи</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Общие</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation>Скрыть панель инструментов (иконки)</translation>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation>Сворачивать вместо закрытия программы</translation>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Значок в области уведомлений</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>Тёмный значок в области уведомлений</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>При сворачивании скрывать окно в область уведомлений</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Язык</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Автоввод</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>Использовать название записи для глобального автоввода</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>Использовать URL-адрес для глобального автоввода</translation>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>Всегда спрашивать перед автовводом</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Комбинация клавиш для глобального автоввода</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation>Задержка автоввода</translation>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation> мс</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation>Задержка начала автоввода</translation>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>Таймауты</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>Очищать буфер обмена через</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>сек</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>Блокировать базу данных при отсутствии активности в течение</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation> мин</translation>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation>Забыть TouchID после неактивности</translation>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>Удобство</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Блокировать базу данных при блокировке сеанса или закрытии крышки ноутбука</translation>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation>Забыть TouchID, когда сеанс заблокирован или крышка закрыта</translation>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>Блокировать базу данных при сворачивании окна</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation>Заблокировать базу данных после автоввода</translation>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>Не требовать повторный ввод пароля, когда он показывается</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation>Не скрывать пароли при их изменении</translation>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation>Не использовать заполнитель для полей с пустым паролем</translation>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation>Скрывать пароли в панели предварительного просмотра записи</translation>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>Скрыть примечания записи по умолчанию</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>Конфиденциальность</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation>Использовать DuckDuckGo как резервный источник для скачивания значков сайта</translation>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -216,6 +494,27 @@ Please select whether you want to allow access.</source>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation>KeePassXC-Browser сохранить запись</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Отмена</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation>У вас открыто несколько баз данных.
+Пожалуйста, выберите нужную базу данных для сохранения учетных данных.</translation>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -289,14 +588,6 @@ Please select whether you want to allow access.</source>
         <translation>Сортировать по &amp;имени пользователя</translation>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>&amp;Отключить все браузеры</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>Забыть все &amp;разрешения</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>Дополнительные</translation>
     </message>
@@ -362,14 +653,6 @@ Please select whether you want to allow access.</source>
         <translation>&lt;b&gt;ВНИМАНИЕ:&lt;/b&gt; Следующие параметры могут быть опасны!</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>Исполняемые файлы (*.exe);;Все файлы (*.*)</translation>
-    </message>
-    <message>
-        <source>Executable Files (*)</source>
-        <translation>Исполняемые файлы (*)</translation>
-    </message>
-    <message>
         <source>Select custom proxy location</source>
         <translation>Выбрать другое расположение прокси</translation>
     </message>
@@ -377,6 +660,31 @@ Please select whether you want to allow access.</source>
         <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
         <translation>KeePassXC-Browser сейчас не поддерживается для выпусков Snap.</translation>
     </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation>KeePassXC-Browser необходим для интеграции браузера. &lt;br /&gt; Cкачайте его для %1 и %2.</translation>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation>&amp;Tor Browser</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: </source>
+        <translation>&lt;b&gt;Предупреждение&lt;/b&gt;, приложение keepassxc-proxy не найдено! &lt;br /&gt; Проверьте каталог установки KeePassXC или установите пользовательский путь в расширенные настройках. &lt;br /&gt;Интеграция браузера не будет работы без прокси приложения. &lt;br /&gt;Ожидаемый путь: </translation>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation>Исполняемые файлы</translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <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"/>
+    </message>
 </context>
 <context>
     <name>BrowserService</name>
@@ -417,152 +725,45 @@ Do you want to overwrite it?</source>
         <translation>Обновить информацию в %1 — %2?</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: База данных заблокирована!</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Активная база данных заблокирована!
-Разблокируйте выбранную базу данных или выберите другую, незаблокированную.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Параметры недоступны!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation>В базе данных отсутствует запись с настройками.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Ключи не найдены</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation>Общие секретные ключи не найдены в настройках KeePassXC.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Ключи удалены из базы данных</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation><numerusform>Успешно удалена %n ключ(и) шифрования от KeePassXC параметров.</numerusform><numerusform>Успешно удалена %n ключ(и) шифрования от KeePassXC параметров.</numerusform><numerusform>Успешно удалена %n ключ(и) шифрования от KeePassXC параметров.</numerusform><numerusform>Успешно удалено ключей шифрования из параметров KeePassXC: %n.</numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>Удаление сохранённых разрешений...</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>Прервать</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Разрешения удалены</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation><numerusform>Успешно удалены разрешения от %n entry(s).</numerusform><numerusform>Успешно удалены разрешения от %n entry(s).</numerusform><numerusform>Успешно удалены разрешения от %n entry(s).</numerusform><numerusform>Успешно удалены разрешения из %n записей.</numerusform></translation>
-    </message>
-    <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Не найдена запись с разрешениями!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Активная база данных не содержит записей с назначенными разрешениями.</translation>
-    </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>Пароль</translation>
-    </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>Введите пароль:</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>Повторите пароль:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;Ключевой файл</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>Обзор</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Создать</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>Ответ на &amp;вызов</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Обновить</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>Ключевые файлы</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>Все файлы</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>Создать ключевой файл...</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>Невозможно создать ключевой файл:</translation>
+        <source>Converting attributes to custom data…</source>
+        <translation>Преобразование атрибутов в пользовательских данных...</translation>
     </message>
     <message>
-        <source>Select a key file</source>
-        <translation>Выберите ключевой файл</translation>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation>KeePassXC: Атрибуты KeePassHTTP преобразованы</translation>
     </message>
     <message>
-        <source>Empty password</source>
-        <translation>Пустой пароль</translation>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>Вы действительно хотите использовать в качестве пароля пустую строку?</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation><numerusform>Успешно переехал %n ключи пользовательских данных.</numerusform><numerusform>Успешно переехал %n ключи пользовательских данных.</numerusform><numerusform>Успешно переехал %n ключи пользовательских данных.</numerusform><numerusform>Успешно перемещено %n ключей в пользовательские данные.</numerusform></translation>
     </message>
     <message>
-        <source>Different passwords supplied.</source>
-        <translation>Пароли не совпадают.</translation>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation>KeePassXC: Не найдено записи с атрибутами KeePassHTTP!</translation>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>Не удалось установить %1 ключевым файлом:
-%2</translation>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation>Активная база данных не содержит запись с атрибутами KeePassHTTP.</translation>
     </message>
     <message>
-        <source>Legacy key file format</source>
-        <translation>Устаревший формат ключевого файла</translation>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation>KeePassXC: Устаревшая интеграция с браузером обнаружена</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>Вы используете ключевой файл устаревшего формата, поддержка которого может быть прекращена в будущем.
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation>Параметры устаревшей интеграции с браузерами были обнаружены. Вы хотите обновить параметры до нового стандарта?
 
-По возможности создайте новый ключевой файл.</translation>
-    </message>
-    <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>Не удалось сменить мастер-ключ: YubiKey не подключен.</translation>
+Это необходимо для сохранения совместимости с плагином для браузера.</translation>
     </message>
 </context>
 <context>
@@ -643,14 +844,6 @@ Please consider generating a new key file.</source>
         <translation>Отсутствует в CSV-файле</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>Пустое поле</translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>столбец </translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>Импортировано из CSV-файла</translation>
     </message>
@@ -659,48 +852,84 @@ Please consider generating a new key file.</source>
         <translation>Исходные данные: </translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>Ошибки в файле CSV!</translation>
+        <source>Error</source>
+        <translation>Ошибка</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation> пропущено больше сообщений]</translation>
+        <source>Empty fieldname %1</source>
+        <translation>Пустое имя поле %1</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Ошибка</translation>
+        <source>column %1</source>
+        <translation>колонке %1</translation>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>Импорт CSV: у записи есть ошибки:
-</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation>В CSV-файле обнаруженны ошибки!</translation>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>Ошибка</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation><numerusform>[%n больше сообщений пропущен]</numerusform><numerusform>[%n больше сообщений пропущен]</numerusform><numerusform>[%n больше сообщений пропущен]</numerusform><numerusform>[%n сообщений пропущено]</numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Невозможно вычислить мастер-пароль</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation>Импорт CSV: запись была с ошибками: %1</translation>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
-        <translation><numerusform>%n байт(а), </numerusform><numerusform>%n байт(а), </numerusform><numerusform>%n байт(а), </numerusform><numerusform>%n байт, </numerusform></translation>
+        <source>%n column(s)</source>
+        <translation><numerusform>%n столбцов</numerusform><numerusform>%n столбцов</numerusform><numerusform>%n столбцов</numerusform><numerusform>%n столбцов</numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation>%1, %2, %3</translation>
     </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
-        <translation><numerusform>%n строк, </numerusform><numerusform>%n строк, </numerusform><numerusform>%n строк, </numerusform><numerusform>%n строк, </numerusform></translation>
+        <source>%n byte(s)</source>
+        <translation><numerusform>%n байт(ов)</numerusform><numerusform>%n байт(ов)</numerusform><numerusform>%n байт(ов)</numerusform><numerusform>%n байт(ов)</numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
-        <translation><numerusform>%n столбцов</numerusform><numerusform>%n столбцов</numerusform><numerusform>%n столбцов</numerusform><numerusform>%n столбцов</numerusform></translation>
+        <source>%n row(s)</source>
+        <translation><numerusform>%n строка</numerusform><numerusform>%n строк</numerusform><numerusform>%n строк</numerusform><numerusform>%n строк</numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Корень</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>Файл %1 не существует.</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Не удается открыть файл %1.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation>Ошибка при чтении базы данных: %1</translation>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation>Не удалось сохранить, отсутствует имя у файла базы данных.</translation>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation>Разблокировать базу данных - KeePassXC</translation>
     </message>
 </context>
 <context>
@@ -730,14 +959,6 @@ Please consider generating a new key file.</source>
         <translation>Ответ на вызов:</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Невозможно открыть базу данных.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Невозможно открыть ключевой файл</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation>Устаревший формат ключевого файла</translation>
     </message>
@@ -766,105 +987,170 @@ Please consider generating a new key file.</source>
         <source>Select key file</source>
         <translation>Выберите ключевой файл</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>Восстановить базу данных</translation>
+        <source>TouchID for quick unlock</source>
+        <translation>TouchID для быстрой разблокировки</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Ошибка</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation>Не удается открыть базу данных:
+%1</translation>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Невозможно открыть ключевой файл</translation>
+        <source>Can't open key file:
+%1</source>
+        <translation>Не удается открыть ключевой файл:
+%1</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Невозможно открыть базу данных.</translation>
+        <source>Passwords</source>
+        <translation>Пароли</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Дополнительные параметры</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Общие</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>База данных успешна открыта. Больше нечего делать.</translation>
+        <source>Security</source>
+        <translation>Безопасность</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>Успешно</translation>
+        <source>Master Key</source>
+        <translation>Мастер ключ</translation>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>База данных восстановлена.
-Теперь можете её сохранить.</translation>
+        <source>Encryption Settings</source>
+        <translation>Параметры шифрования</translation>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>Невозможно восстановить базу данных.</translation>
+        <source>Browser Integration</source>
+        <translation>Интеграция с браузером</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>Общие</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation>Настройки KeePassXC-Browser</translation>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>Шифрование</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>&amp;Отключить все браузеры</translation>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Слишком много раундов</translation>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation type="unfinished"/>
     </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>Слишком большое число раундов преобразования ключа Argon2.
-
-Если оставить это значение, открытие базы данных может занять часы, дни или даже больше!</translation>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Understood, keep number</source>
-        <translation>Понятно, сохранить значение</translation>
+        <source>Stored keys</source>
+        <translation>Сохраненные ключи</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>Отмена</translation>
+        <source>Remove</source>
+        <translation>Удалить</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Слишком мало раундов</translation>
+        <source>Delete the selected key?</source>
+        <translation>Удалить выбранный ключ?</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>Слишком мало раундов преобразования ключа AES-KDF.
-
-Если оставить это значение, базу данных можно будет слишком легко взломать!</translation>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KDF unchanged</source>
-        <translation>ФФК не изменена</translation>
+        <source>Key</source>
+        <translation>Ключ</translation>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
-        <translation>Ошибка преобразования ФФК с новыми параметрами; ФФК не изменена.</translation>
+        <source>Value</source>
+        <translation>Значение</translation>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation>Отключить все браузеры</translation>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Ключи не найдены</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Ключи удалены из базы данных</translation>
     </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
-        <translation><numerusform>МиБ</numerusform><numerusform>МиБ</numerusform><numerusform>МиБ</numerusform><numerusform>МиБ</numerusform></translation>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Удаление сохранённых разрешений...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Прервать</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Разрешения удалены</translation>
     </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
-        <translation><numerusform>поток</numerusform><numerusform>потока</numerusform><numerusform>потоков</numerusform><numerusform>потоков</numerusform></translation>
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: Не найдена запись с разрешениями!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Активная база данных не содержит записей с разрешениями.</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
     </message>
 </context>
 <context>
@@ -901,6 +1187,113 @@ If you keep this number, your database may be too easy to crack!</source>
         <source>Parallelism:</source>
         <translation>Параллелизм:</translation>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation>?? с</translation>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation>Изменить</translation>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation>100 мс</translation>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation>5 s</translation>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation>Более высокие значения дают более высокий уровень защиты, но открытие базы данных займет больше времени.</translation>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation>Формат базы данных:</translation>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation>KDBX 4.0 (рекомендуется)</translation>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation>KDBX 3.1</translation>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation>без изменений</translation>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Слишком много раундов</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>Слишком большое число раундов преобразования ключа Argon2.
+
+Если оставить это значение, открытие базы данных может занять часы, дни или даже больше!</translation>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation>Понятно, сохранить значение</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Отмена</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Слишком мало раундов</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>Слишком мало раундов преобразования ключа AES-KDF.
+
+Если оставить это значение, базу данных можно будет слишком легко взломать!</translation>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation>ФФК не изменена</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation>Ошибка преобразования ФФК с новыми параметрами; ФФК не изменена.</translation>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation><numerusform> МиБ</numerusform><numerusform> МиБ</numerusform><numerusform> МиБ</numerusform><numerusform> МиБ</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation><numerusform> потоков</numerusform><numerusform> потоков</numerusform><numerusform> потоков</numerusform><numerusform> потоков</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation><numerusform>%1 мс</numerusform><numerusform>%1 мс</numerusform><numerusform>%1 мс</numerusform><numerusform>%1 мс</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform><numerusform>%1 s</numerusform><numerusform>%1 c</numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -950,91 +1343,110 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>Корень</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>База данных KeePass 2</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Все файлы</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Открыть базу данных</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>Файл не найден!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Невозможно открыть базу данных.</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>Файл открыт в режиме только для чтения.</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
+    <message>
+        <source>Add additional protection...</source>
+        <translation>Добавить дополнительную защиту...</translation>
     </message>
     <message>
-        <source>Open CSV file</source>
-        <translation>Открыть файл CSV</translation>
+        <source>No encryption key added</source>
+        <translation>Ключ шифрования не добавлен</translation>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>Файл CSV</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>Все файлы (*)</translation>
+        <source>No password set</source>
+        <translation>Пароль не установлен</translation>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Объединить базу данных</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 type="unfinished"/>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Открыть базу данных KeePass 1</translation>
+        <source>Unknown error</source>
+        <translation>Неизвестная ошибка</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>База данных KeePass 1</translation>
+        <source>Failed to change master key</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>Close?</source>
-        <translation>Закрыть?</translation>
+        <source>Database Name:</source>
+        <translation>Имя базы данных:</translation>
     </message>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>«%1» в режиме правки.
-Отменить изменения и всё равно закрыть?</translation>
+        <source>Description:</source>
+        <translation>Описание:</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>Save changes?</source>
-        <translation>Сохранить изменения?</translation>
+        <source>KeePass 2 Database</source>
+        <translation>База данных KeePass 2</translation>
     </message>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>«%1» изменён.
-Сохранить изменения?</translation>
+        <source>All files</source>
+        <translation>Все файлы</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Не удалось записать базу данных.</translation>
+        <source>Open database</source>
+        <translation>Открыть базу данных</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Пароли</translation>
+        <source>CSV file</source>
+        <translation>Файл CSV</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Сохранить базу данных как</translation>
+        <source>Merge database</source>
+        <translation>Объединить базу данных</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Открыть базу данных KeePass 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>База данных KeePass 1</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1045,40 +1457,40 @@ Save changes?</source>
         <translation>Не удалось записать CSV-файл.</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>Новая база данных</translation>
+        <source>Database creation error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>locked</source>
-        <translation>заблокировано</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 type="unfinished"/>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>Заблокировать базу данных</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>Невозможно заблокировать базу данных, так как вы её сейчас редактируете.
-Нажмите &apos;Отмена&apos;, чтобы завершить изменения или отменить их.</translation>
+        <source>Select CSV file</source>
+        <translation>Выберать CSV-файл</translation>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>База данных была изменена.
-Сохранить её перед тем, как заблокировать?
-В противном случае все изменения будут потеряны.</translation>
+        <source>New Database</source>
+        <translation>Новая база данных</translation>
     </message>
     <message>
-        <source>Disable safe saves?</source>
-        <translation>Отключить безопасное сохранение?</translation>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
     </message>
     <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 несколько раз не удалось сохранить базу данных. Это могло быть вызвано службами синхронизации файлов, блокирующими файл при сохранении.
-Отключить безопасное сохранение и повторить попытку?</translation>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Заблокировано]</translation>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Только для чтения]</translation>
     </message>
 </context>
 <context>
@@ -1088,37 +1500,13 @@ Disable safe saves and try again?</source>
         <translation>Поиск...</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>Сменить мастер-пароль</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>Удалить запись?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>Удалить навсегда запись «%1»?</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Удалить записи?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Удалить навсегда записи (%1)?</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Переместить запись в корзину?</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation>Переместить запись «%1» в корзину?</translation>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Поместить записи в корзину?</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation><numerusform>Вы действительно хотите переместить %n entry(s) в корзину?</numerusform><numerusform>Вы действительно хотите переместить %n entry(s) в корзину?</numerusform><numerusform>Вы действительно хотите переместить %n entry(s) в корзину?</numerusform><numerusform>Вы действительно хотите переместить записи (%n) в корзину?</numerusform></translation>
@@ -1136,18 +1524,10 @@ Disable safe saves and try again?</source>
         <translation>Запомнить мой выбор</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Удалить группу?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>Удалить навсегда группу «%1»?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Невозможно вычислить мастер-пароль</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>Нет текущей базы данных.</translation>
     </message>
@@ -1182,10 +1562,6 @@ Do you want to merge your changes?</source>
 Объединить изменения?</translation>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>Не удалось открыть новый файл базы данных при попытке автоматической перезагрузки этой базы данных.</translation>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>Очистить корзину?</translation>
     </message>
@@ -1193,88 +1569,104 @@ Do you want to merge your changes?</source>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>Удалить всё из корзины?</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>Генерировать токен TOTP</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Закрыть</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Файл открыт в режиме только для чтения.</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Общие</translation>
+        <source>Lock Database?</source>
+        <translation>Заблокировать базу данных?</translation>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Пароль</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL-адрес</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>«%1» изменён.
+Сохранить изменения?</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>Срок действия</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Имя пользователя</translation>
+        <source>Save changes?</source>
+        <translation>Сохранить изменения?</translation>
     </message>
     <message>
-        <source>Autotype</source>
-        <translation>Автоввод</translation>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>Поиск</translation>
+        <source>Disable safe saves?</source>
+        <translation>Отключить безопасное сохранение?</translation>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>Атрибуты</translation>
+        <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 несколько раз не удалось сохранить базу данных. Это могло быть вызвано службами синхронизации файлов, блокирующими файл при сохранении.
+Отключить безопасное сохранение и повторить попытку?</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Вложения</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Примечания</translation>
+        <source>Passwords</source>
+        <translation>Пароли</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>Окно</translation>
+        <source>Save database as</source>
+        <translation>Сохранить базу данных как</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>Последовательность</translation>
+        <source>KeePass 2 Database</source>
+        <translation>База данных KeePass 2</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Поиск</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Очистить</translation>
+        <source>Delete group</source>
+        <translation>Удалить группу</translation>
     </message>
     <message>
-        <source>Never</source>
-        <translation>Никогда</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[ЗАЩИЩЕННЫЙ]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>Отключено</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Включено</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1348,22 +1740,10 @@ Do you want to merge your changes?</source>
         <translation>Новый атрибут</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Подтверждение удаления</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>Удалить этот атрибут?</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[ЗАЩИЩЁННЫЙ]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation>Нажмите &apos;Показать&apos; для просмотра или редактирования</translation>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>Завтра</translation>
     </message>
@@ -1376,10 +1756,6 @@ Do you want to merge your changes?</source>
         <translation><numerusform>%n месяц(-а)(-ев)</numerusform><numerusform>%n месяц(-а)(-ев)</numerusform><numerusform>%n месяц(-а)(-ев)</numerusform><numerusform>%n мес.</numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 год</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation>Применить сгенерированный пароль?</translation>
     </message>
@@ -1391,6 +1767,26 @@ Do you want to merge your changes?</source>
         <source>Entry updated successfully.</source>
         <translation>Запись успешно обновлена.</translation>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation>[Защищён] Нажмите для открытия просмотра или правки</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n год</numerusform><numerusform>%n лет</numerusform><numerusform>%n лет</numerusform><numerusform>%n лет</numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1636,6 +2032,81 @@ Do you want to merge your changes?</source>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Пароль:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1693,10 +2164,6 @@ Do you want to merge your changes?</source>
         <translation>Не удалось получить значок.</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Подсказка: в качестве резервного варианта для получения значков сайтов можно использовать Google. Включите этот параметр в меню «Инструменты -&gt; Параметры -&gt; Безопасность».</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>Изображения</translation>
     </message>
@@ -1705,14 +2172,6 @@ Do you want to merge your changes?</source>
         <translation>Все файлы</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Выбор изображения</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read icon</source>
-        <translation>Невозможно прочитать значок</translation>
-    </message>
-    <message>
         <source>Custom icon already exists</source>
         <translation>Пользовательский значок уже существует</translation>
     </message>
@@ -1721,8 +2180,36 @@ Do you want to merge your changes?</source>
         <translation>Подтверждение удаления</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>Этот значок используется в %1 записях, он будет заменен на стандартный. Хотите удалить его?</translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation>Пользовательская иконка успешно загружена</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation>Выбор изображения</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1773,9 +2260,8 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation> - клон</translation>
+        <source>%1 - Clone</source>
+        <translation>%1 - Клон</translation>
     </message>
 </context>
 <context>
@@ -1820,10 +2306,6 @@ This may cause the affected plugins to malfunction.</source>
         <translation><numerusform>Вы уверены, что вы хотите удалить %n вложения?</numerusform><numerusform>Вы уверены, что вы хотите удалить %n вложения?</numerusform><numerusform>Вы уверены, что вы хотите удалить %n вложения?</numerusform><numerusform>Действительно хотите удалить вложения (%n)?</numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Подтверждение удаления</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>Сохранить вложения</translation>
     </message>
@@ -1859,10 +2341,13 @@ This may cause the affected plugins to malfunction.</source>
 %1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation>Подтвердить удаление</translation>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>Невозможно открыть файлы:
-%1</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1946,6 +2431,106 @@ This may cause the affected plugins to malfunction.</source>
         <source>Attachments</source>
         <translation>Вложения</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>Да</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>Генерировать токен TOTP</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Закрыть</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Общие</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Имя пользователя</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Пароль</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Срок действия</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL-адрес</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>Атрибуты</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Вложения</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Примечания</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Автоввод</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Окно</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Последовательность</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Поиск</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Поиск</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Очистить</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Никогда</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[ЗАЩИЩЁННЫЙ]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Включено</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Отключено</translation>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EntryView</name>
@@ -1984,6 +2569,19 @@ This may cause the affected plugins to malfunction.</source>
         <source>Recycle Bin</source>
         <translation>Корзина</translation>
     </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation>[пустой]</translation>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>HostInstaller</name>
@@ -1997,61 +2595,6 @@ This may cause the affected plugins to malfunction.</source>
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>Длина:</translation>
-    </message>
-    <message>
-        <source>Character Types</source>
-        <translation>Виды символов</translation>
-    </message>
-    <message>
-        <source>Upper Case Letters</source>
-        <translation>Заглавные буквы</translation>
-    </message>
-    <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
-    </message>
-    <message>
-        <source>Lower Case Letters</source>
-        <translation>Строчные буквы</translation>
-    </message>
-    <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
-    </message>
-    <message>
-        <source>Numbers</source>
-        <translation>Цифры</translation>
-    </message>
-    <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
-    </message>
-    <message>
-        <source>Special Characters</source>
-        <translation>Специальные символы</translation>
-    </message>
-    <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
-    </message>
-    <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Не использовать визуально схожие символы</translation>
-    </message>
-    <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>Формировать пароль с символами из каждой группы</translation>
-    </message>
-    <message>
-        <source>Extended ASCII</source>
-        <translation>Расширенный ASCII</translation>
-    </message>
-</context>
-<context>
     <name>KMessageWidget</name>
     <message>
         <source>&amp;Close</source>
@@ -2076,6 +2619,26 @@ This may cause the affected plugins to malfunction.</source>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Неверный ключ, либо повреждён файл базы данных.</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation>отсутствуют заголовки базы данных</translation>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>Недопустимый размер идентификатора заголовка</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>Недопустимая длина поля заголовка</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>Недопустимая длина данных заголовка</translation>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2235,10 +2798,6 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation>Недопустимая длина uuid шифра</translation>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation>Неподдерживаемый шифр</translation>
     </message>
@@ -2292,6 +2851,18 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Unsupported KeePass 2 database version.</source>
         <translation>Неподдерживаемая версия базы данных KeePass 2.</translation>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation>Не удается выполнить разбор UUID: %1</translation>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2364,10 +2935,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Элемент истории с отличающимся uuid</translation>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation>Невозможно расшифровать строку записи</translation>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation>Обнаружен повторяющиеся пользовательский атрибут</translation>
     </message>
@@ -2416,6 +2983,12 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation>Невозможно распаковать двоичные данные</translation>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2579,28 +3152,126 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Invalid entry field type</source>
         <translation>Недопустимый тип поля записи</translation>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>Повреждён файл блокировки запуска, запуск нового экземпляра программы.</translation>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>Невозможно создать файл блокировки. Режим недублирующего хранения отключён.</translation>
+        <source>Import from</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Другой экземпляр KeePassXC уже запущен.</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Неустранимая ошибка при тестировании криптографических функций.</translation>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>Ошибка - KeePassXC</translation>
+        <source>Key Component</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Отмена</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation>Добавить %1</translation>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation>Изменить %1</translation>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation>Удалить %1</translation>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation>%1 установлен, нажмите, чтобы изменить или удалить</translation>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>Обзор</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Генерировать</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Ключевые файлы</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Все файлы</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Создать ключевой файл...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Выберите ключевой файл</translation>
     </message>
 </context>
 <context>
@@ -2614,10 +3285,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Недавние базы данных</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Импорт</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation>Справка</translation>
     </message>
@@ -2626,14 +3293,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Записи</translation>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>Скопировать &amp;атрибут в буфер обмена</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation>Временной одноразовый пароль</translation>
-    </message>
-    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Группы</translation>
     </message>
@@ -2662,30 +3321,10 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Закрыть базу данных</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>&amp;Новая база данных</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>Объединить с базой данных KeePassX</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>&amp;Создать запись</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>&amp;Открыть/изменить запись</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>&amp;Удалить запись</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>&amp;Создать группу</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>&amp;Изменить группу</translation>
     </message>
@@ -2698,14 +3337,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Сохранить базу данных как...</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Изменить &amp;мастер-пароль...</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>Параметры базы данных</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>Параметры базы данных</translation>
     </message>
@@ -2714,10 +3345,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Клонировать запись</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>&amp;Найти</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>Скопировать &amp;имя пользователя</translation>
     </message>
@@ -2726,10 +3353,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Скопировать имя пользователя в буфер обмена</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>&amp;Скопировать пароль</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>Скопировать пароль в буфер обмена</translation>
     </message>
@@ -2742,14 +3365,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Генератор паролей</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation>Вы&amp;полнить автоввод</translation>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>&amp;Открыть URL-адрес</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>&amp;Заблокировать базу данных</translation>
     </message>
@@ -2782,22 +3397,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Экспорт в CSV-файл...</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Импортировать базу данных KeePass 1...</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>Импорт CSV-файла...</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Во&amp;сстановить базу данных...</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>Показать TOTP</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>Установить TOTP...</translation>
     </message>
@@ -2818,14 +3417,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Ошибка доступа к файлу конфигурации %1</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Похоже вы используете KeePassHTTP для интеграции с браузером. Эта функция является устаревшей и будет удалена в будущем.&lt;br&gt;Пожалуйста перейдите на KeePassXC-Browser! Чтобы получить помощь прочтите наше &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;руководство по миграции&lt;/a&gt; (предупреждение %1 of 3).&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>только для чтения</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Параметры</translation>
     </message>
@@ -2838,36 +3429,278 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Закрыть KeePassXC</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>База данных KeePass 2</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Нажмите кнопку на YubiKey!</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Все файлы</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation>ВНИМАНИЕ: Используется нестабильная сборка KeePassXC!
+Весьма вероятно повреждение базы данных, сделайте её резервную копию.
+Эта версия не предназначена для повседневного использования.</translation>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Открыть базу данных</translation>
+        <source>&amp;Donate</source>
+        <translation>&amp;Пожертвовать</translation>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Сохранить восстановленную базу данных</translation>
+        <source>Report a &amp;bug</source>
+        <translation>Сообщить об &amp;ошибке</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Не удалось записать базу данных.</translation>
+        <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>Предупреждение: Ваша версия Qt может привести к сбоям KeePassXC при работе с экранной клавиатурой!
+Мы рекомендуем вам использовать AppImage доступны на нашей странице загрузки.</translation>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Нажмите кнопку на YubiKey!</translation>
+        <source>&amp;Import</source>
+        <translation>&amp;Import</translation>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
-        <translation>ВНИМАНИЕ: Используется нестабильная сборка KeePassXC!
-Весьма вероятно повреждение базы данных, сделайте её резервную копию.
-Эта версия не предназначена для повседневного использования.</translation>
+        <source>Copy att&amp;ribute...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Корень</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Дополнительные параметры</translation>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <translation>Параметры шифрования</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 type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2970,125 +3803,34 @@ This version is not meant for production use.</source>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation>Диалог</translation>
-    </message>
-    <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>Это необходимо для доступа к вашим базам данных из ChromeIPass или PassIFox</translation>
-    </message>
-    <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>Включить сервер KeePassHTTP</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Общие</translation>
-    </message>
-    <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>Уведомлять при запросе учётных данных</translation>
-    </message>
-    <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>Возвращает только лучшие совпадения для определённого URL-адреса, а не все записи для целого домена.</translation>
-    </message>
-    <message>
-        <source>&amp;Return only best matching entries</source>
-        <translation>Только лучшие сов&amp;падения</translation>
-    </message>
-    <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Запрашивать разблокировку базы данных, если она заблокирована</translation>
-    </message>
-    <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation>Будут отобраны только записи с совпадающим протоколом  (http://, https://, ftp://, ...).</translation>
-    </message>
-    <message>
-        <source>&amp;Match URL schemes</source>
-        <translation>&amp;Проверять протокол URL</translation>
-    </message>
-    <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Сортировать совпавшие записи по &amp;имени пользователя</translation>
-    </message>
-    <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Сортировать совпадающие записи по названию</translation>
-    </message>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>&amp;Удалить все общие ключи шифрования из активной базы данных</translation>
-    </message>
-    <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>Удалить все сохранённые разрешения из записей активной базы данных</translation>
-    </message>
-    <message>
-        <source>Password Generator</source>
-        <translation>Генератор паролей</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Дополнительно</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Всегда разрешать доступ к записям</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Всегда разрешать обновление записей</translation>
-    </message>
-    <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>К клиенту должна быть подключена только выбранная база данных.</translation>
-    </message>
-    <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Искать подходящие записи во всех открытых базах данных</translation>
-    </message>
-    <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>Автоматическое создание или обновление полей, содержащих строки, не поддерживается.</translation>
-    </message>
-    <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>Возвращать дополнительные стро&amp;ковые поля, начинающиеся с «KPH: »</translation>
-    </message>
-    <message>
-        <source>HTTP Port:</source>
-        <translation>Порт HTTP:</translation>
+        <source>Enter password:</source>
+        <translation>Введите пароль:</translation>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Порт по умолчанию: 19455</translation>
+        <source>Confirm password:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC будет слушать этот порт на 127.0.0.1</translation>
+        <source>Password</source>
+        <translation>Пароль</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;ВНИМАНИЕ:&lt;/b&gt; Следующие параметры могут быть опасны!</translation>
+        <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"/>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;KeePassHTTP устарел и в будущем будет удалён.&lt;br&gt;Перейдите на KeePassXC-Browser! Если вам нужна помощь, прочтите &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;руководство по переходу&lt;/a&gt;.&lt;/p&gt;</translation>
+        <source>Password cannot be empty.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Не удаётся выполнить привязку к привилегированным портам</translation>
+        <source>Passwords do not match.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Не удаётся выполнить привязку к привилегированным портам с номерами меньше 1024!
-Используется порт по умолчанию: 19455.</translation>
+        <source>Generate master password</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3159,18 +3901,10 @@ Using default port 19455.</source>
         <translation>Список слов:</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Количество слов:</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>Разделитель слов:</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>Генерировать</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
@@ -3183,10 +3917,6 @@ Using default port 19455.</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>Применить</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>Энтропия: %1 бит</translation>
     </message>
@@ -3214,6 +3944,171 @@ Using default port 19455.</source>
         <comment>Password quality</comment>
         <translation>Отличный</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Дополнительные</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Удалить</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Удалить</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Выключено</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3234,34 +4129,18 @@ Using default port 19455.</source>
         <translation>Невозможно расшифровать сообщение</translation>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
-        <translation>Истекло время ожидания, либо невозможно подключиться к KeePassXC</translation>
-    </message>
-    <message>
         <source>Action cancelled or denied</source>
         <translation>Действие отменено или запрещено</translation>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation>Невозможно зашифровать сообщение, либо не найден публичный ключ. Включён ли в KeePassXC механизм Native Messaging?</translation>
-    </message>
-    <message>
         <source>KeePassXC association failed, try again</source>
         <translation>Ассоциирование KeePassXC не выполнено, попробуйте ещё раз</translation>
     </message>
     <message>
-        <source>Key change was not successful</source>
-        <translation>Изменить ключ не удалось</translation>
-    </message>
-    <message>
         <source>Encryption key is not recognized</source>
         <translation>Не распознан ключ шифрования</translation>
     </message>
     <message>
-        <source>No saved databases found</source>
-        <translation>Нет сохранённых баз данных</translation>
-    </message>
-    <message>
         <source>Incorrect action</source>
         <translation>Неправильное действие</translation>
     </message>
@@ -3387,10 +4266,6 @@ Using default port 19455.</source>
         <translation>Введите пароль для разблокировки %1: </translation>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation>Не удалось загрузить ключевой файл %1: %2</translation>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3475,12 +4350,6 @@ Available commands:
         <translation>Ошибка чтения из устройства</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>Файл пуст !
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation>Неправильная строка</translation>
     </message>
@@ -3489,30 +4358,6 @@ Available commands:
         <translation>Отсутствует закрывающая кавычка</translation>
     </message>
     <message>
-        <source>AES: 256-bit</source>
-        <translation>AES: 256-бит</translation>
-    </message>
-    <message>
-        <source>Twofish: 256-bit</source>
-        <translation>Twofish: 256-бит</translation>
-    </message>
-    <message>
-        <source>ChaCha20: 256-bit</source>
-        <translation>ChaCha20: 256-бит</translation>
-    </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – рекомендуется)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 4)</source>
-        <translation>AES-KDF (KDBX 4)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 3.1)</source>
-        <translation>AES-KDF (KDBX 3.1)</translation>
-    </message>
-    <message>
         <source>Group</source>
         <translation>Группа</translation>
     </message>
@@ -3541,10 +4386,6 @@ Available commands:
         <translation>Создан</translation>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
-        <translation>Устаревшая интеграция с браузером</translation>
-    </message>
-    <message>
         <source>Browser Integration</source>
         <translation>Интеграция с браузером</translation>
     </message>
@@ -3573,10 +4414,6 @@ Available commands:
         <translation>Количество слов для парольной фразы.</translation>
     </message>
     <message>
-        <source>count</source>
-        <translation>количество</translation>
-    </message>
-    <message>
         <source>Wordlist for the diceware generator.
 [Default: EFF English]</source>
         <translation>Список слов для генератора парольной фразы.
@@ -3587,28 +4424,438 @@ Available commands:
         <translation>Сгенерировать новый случайный пароль.</translation>
     </message>
     <message>
-        <source>Length of the generated password.</source>
-        <translation>Длина сгенерированного пароля.</translation>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
-        <translation>Использовать строчные буквы в генерируемом пароле.</translation>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
-        <translation>Использовать заглавные буквы в генерируемом пароле.</translation>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
-        <translation>Использовать цифры в генерируемом пароле.</translation>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
-        <translation>Использовать специальные символы в генерируемом пароле.</translation>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
-        <translation>Использовать расширенные символы ASCII в генерируемом пароле.</translation>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation>количество</translation>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>Файл %1 не существует.</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Не удается открыть файл %1.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256-бит</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256-бит</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256-бит</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – рекомендуется)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>Удалить запись из базы данных.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>Путь к записи для удаления.</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>Повреждён файл блокировки запуска, запуск нового экземпляра программы.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Невозможно создать файл блокировки. Режим недублирующего хранения отключён.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - кроссплатформенный менеджер паролей</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>имена файлов открываемой базы данных паролей (*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>путь к своему файлу настроек</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>ключевой файл базы данных</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>читать пароли базы данных с stdin</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation>Дескриптор родительского окна</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Другой экземпляр KeePassXC уже запущен.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Неустранимая ошибка при тестировании криптографических функций.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>Ошибка - KeePassXC</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation>Пароль базы данных: </translation>
     </message>
 </context>
 <context>
@@ -3646,12 +4893,98 @@ Available commands:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
     <message>
-        <source>Search...</source>
-        <translation>Поиск...</translation>
+        <source>Agent connection failed.</source>
+        <translation>Сбой подключения агента.</translation>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation>Ошибка протокола агента.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation>Агент не запущен, не удается добавить идентификатор.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation>Агент не запущен, не удается удалить личность</translation>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation>Агент отклонил учетную запись. Возможные причины:</translation>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation>Ключ уже добавлен.</translation>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation>Ограничение по времени не поддерживается этим агентом (проверьте настройки).</translation>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation>Запрос подтверждения не поддерживается этим агентом (проверьте настройки).</translation>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
     </message>
     <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
         <source>Search</source>
         <translation>Поиск</translation>
     </message>
@@ -3660,314 +4993,316 @@ Available commands:
         <translation>Очистить</translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Различать регистр</translation>
-    </message>
-    <message>
         <source>Limit search to selected group</source>
         <translation>Поиск только в выбранной группе</translation>
     </message>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation>Чувствительно к регистру</translation>
+    </message>
 </context>
 <context>
-    <name>Service</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC: Запрос на ассоциацию нового ключа</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation>Получен запрос на ассоциацию вышеуказанного ключа.
-Если хотите разрешить доступ к базе данных KeePassXC,
-дайте ему уникальное имя, чтобы распознать и принять ключ.</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: Перезаписать существующий ключ?</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Общий ключ шифрования с именем «%1» уже существует.
-Перезаписать его?</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: Обновить запись</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Обновить информацию в %1 - %2?</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: База данных заблокирована!</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Активная база данных заблокирована!
-Разблокируйте выбранную базу данных или выберите другую, незаблокированную.</translation>
+        <source>Key:</source>
+        <translation>Ключ:</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Ключи удалены из базы данных</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation><numerusform>Успешно удалена %n шифрования-ключи от параметров KeePassX/Http.</numerusform><numerusform>Успешно удалена %n шифрования-ключи от параметров KeePassX/Http.</numerusform><numerusform>Успешно удалена %n шифрования-ключи от параметров KeePassX/Http.</numerusform><numerusform>Успешно удалено %n ключей шифрования из параметров KeePassX/Http.</numerusform></translation>
+        <source>Generate</source>
+        <translation>Генерировать</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Ключи не найдены</translation>
+        <source>Import</source>
+        <translation>Импорт</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>Совместно используемые ключи шифрования не заданы в параметрах KeePassHttp.</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Параметры недоступны!</translation>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>Активная база данных не содержит записей настроек KeePassHttp.</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>Удаление сохранённых разрешений...</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>Прервать</translation>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Разрешения удалены</translation>
+        <source>Remove</source>
+        <translation>Удалить</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation><numerusform>Успешно удалены разрешения %n записей.</numerusform><numerusform>Успешно удалены разрешения %n записей.</numerusform><numerusform>Успешно удалены разрешения %n записей.</numerusform><numerusform>Успешно удалены разрешения для %n записей.</numerusform></translation>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Не найдена запись с разрешениями!</translation>
+        <source>Status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Активная база данных не содержит записей с разрешениями.</translation>
+        <source>Fingerprint</source>
+        <translation>Отпечаток</translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
-        <translation>Параметры приложения</translation>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Общие</translation>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>Безопасность</translation>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>Ошибка доступа к файлу конфигурации %1</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>Основные параметры</translation>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Запускать только один экземпляр KeePassXC</translation>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>Запоминать последнюю базу данных</translation>
+        <source>All files</source>
+        <translation>Все файлы</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Запоминать последние использованные ключевые файлы и устройства</translation>
+        <source>Select path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Загружать предыдущие базы данных при запуске</translation>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>Автоматически сохранять при выходе</translation>
+        <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"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>Автоматически сохранять после каждого изменения</translation>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Автоматически перезагружать базу данных при её изменении извне</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>Сворачивать при копировании в буфер обмена</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Сворачивать окно при запуске приложения</translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>Использовать значок группы для новых записей</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Не помечать базу данных изменённой при действиях, не связанных с изменением данных (например при распахивании групп)</translation>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
-        <translation>Скрыть подробную информацию</translation>
+        <source>Never</source>
+        <translation>Никогда</translation>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>Значок в области уведомлений</translation>
+        <source>Always</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>При сворачивании скрывать окно в область уведомлений</translation>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
-        <translation>Скрывать окно в область уведомлений вместо выхода</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
-        <translation>Тёмный значок в области уведомлений</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Язык</translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Автоввод</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>Использовать название записи для глобального автоввода</translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>Использовать URL-адрес для глобального автоввода</translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation>Всегда спрашивать перед автовводом</translation>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Комбинация клавиш для глобального автоввода</translation>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>Задержка автоввода</translation>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation> мс</translation>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
-        <translation>Запуск</translation>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
-        <translation>Управление файлами</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation>Безопасное сохранение файлов базы данных (возможна несовместимость с Dropbox и др.)</translation>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
-        <translation>Создавать резервную копию базы данных перед сохранением</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
-        <translation>Управление записями</translation>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Общие</translation>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
-        <translation>Таймауты</translation>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>Очищать буфер обмена через</translation>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>сек</translation>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>Блокировать базу данных при отсутствии активности в течение</translation>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Удобство</translation>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Блокировать базу данных при блокировке сеанса или закрытии крышки ноутбука</translation>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>Блокировать базу данных при сворачивании окна</translation>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>TotpDialog</name>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>Не требовать повторный ввод пароля, когда он показывается</translation>
+        <source>Timed Password</source>
+        <translation>Временной пароль</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>По умолчанию показывать пароль в открытую</translation>
+        <source>000000</source>
+        <translation>000000</translation>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
-        <translation>Скрыть пароли в панели предварительного просмотра</translation>
+        <source>Copy</source>
+        <translation>Копировать</translation>
+    </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>
     </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
     <message>
-        <source>Hide entry notes by default</source>
-        <translation>Скрыть примечания записи по умолчанию</translation>
+        <source>Copy</source>
+        <translation>Копировать</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>Конфиденциальность</translation>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>Использовать Google как резервный вариант для загрузки значков сайтов</translation>
+        <source>There was an error creating the QR code.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
-        <translation>Заблокировать базу данных после автоввода</translation>
+        <source>Closing in %1 seconds.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation>Настроить TOTP</translation>
@@ -3989,59 +5324,84 @@ Please unlock the selected database or choose another one which is unlocked.</so
         <translation>Использовать пользовательские параметры</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>Примечание: изменяйте эти параметры, только если знаете, что делаете.</translation>
+        <source>Custom Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Time step:</source>
         <translation>Временной шаг:</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8 цифр</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>сек</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>Размер кода:</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6 цифр</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>Размер кода:</translation>
+        <source>7 digits</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>сек</translation>
+        <source>8 digits</source>
+        <translation>8 цифр</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>Временной пароль</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Копировать</translation>
+        <source>Close</source>
+        <translation>Закрыть</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>Истекает через</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>секунд</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>Разблокировать базу данных</translation>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4076,42 +5436,26 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
 </context>
 <context>
-    <name>main</name>
-    <message>
-        <source>Remove an entry from the database.</source>
-        <translation>Удалить запись из базы данных.</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>Путь к базе данных.</translation>
-    </message>
-    <message>
-        <source>Path of the entry to remove.</source>
-        <translation>Путь к записи для удаления.</translation>
-    </message>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - кроссплатформенный менеджер паролей</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>имена файлов открываемой базы данных паролей (*.kdbx)</translation>
+        <source>Refresh</source>
+        <translation>Обновить</translation>
     </message>
     <message>
-        <source>path to a custom config file</source>
-        <translation>путь к своему файлу настроек</translation>
+        <source>YubiKey Challenge-Response</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>ключевой файл базы данных</translation>
+        <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"/>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>читать пароли базы данных с stdin</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Parent window handle</source>
-        <translation>Дескриптор родительского окна</translation>
+        <source>No YubiKey inserted.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_sk.ts b/share/translations/keepassx_sk.ts
index 1cc602356..4ad4cc209 100644
--- a/share/translations/keepassx_sk.ts
+++ b/share/translations/keepassx_sk.ts
@@ -38,12 +38,6 @@
         <translation>Kopírovať do schránky</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>Verzia %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>Revízia %1</translation>
     </message>
@@ -76,35 +70,48 @@ Jadro: %3 %4</translation>
         <translation>Špeciálne poďakovanie od tímu KeePassXC patrí debfx za vytvorenie pôvodného KeePassX.</translation>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
-        <translation>Typ zostavenia: %1
-</translation>
+        <source>Version %1</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP Potvrdenie prístupu</translation>
+        <source>Build Type: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>Zapamätať si túto voľbu</translation>
+        <source>Auto-Type</source>
+        <translation>Automatické vypĺňanie</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Povoliť</translation>
+        <source>Browser Integration</source>
+        <translation>Integrácia prehliadača</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>Zakázať</translation>
+        <source>SSH Agent</source>
+        <translation>Agent SSH</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>%1 požiadal prístup k heslám nasledujúcej položky(iek).
-Prosím, zvoľte, či chcete povoliť prístup.</translation>
+        <source>YubiKey</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -113,6 +120,277 @@ Prosím, zvoľte, či chcete povoliť prístup.</translation>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>Zapnúť Agenta SSH (vyžaduje reštart)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Nastavenia aplikácie</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Všeobecné</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Bezpečnosť</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Chyba prístupu ku konfiguračnému súboru %1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Základné nastavenia</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>Štart</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Spustiť len jednu inštanciu KeePassXC</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Zapamätať posledné databázy</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Zapamätať si posledné súbory kľúčov a bezpečnostných kľúčeniek</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Načítať predošlé databázy pri štarte</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>Minimalizovať okno pri spustení aplikácie</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>Správa súborov</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation>Bezpečne uložiť súbory databáz  (môže byť nekompatibilné Dropbox, apod)</translation>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation>Zálohovať databázu pri každom uložení</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Automaticky uložiť po každej zmene</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Automaticky uložiť pri ukončení</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Neoznačovať databázu za zmenenú pri nedátových zmenách (napr. rozbalenie skupiny)</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Automaticky načítať databázu, ak je upravená externe</translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>Správa položky</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>Použiť  ikonu skupiny pri vytváraní položky</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Minimalizovať pri skopírovaní do schránky</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Všeobecné</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Zobraziť ikonu v oznamovacej oblasti</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>Tmavá ikona oznamovacej oblasti</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Skryť okno do oznamovacej oblasti pri minimalizácii</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Jazyk</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Automatické vypĺňanie</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>Použiť názov položky na zhodu okna pre globálne Automatické vypĺňanie</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>Použiť URL položky na zhodu okna pre globálne Automatické vypĺňanie</translation>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>Vždy sa spýtať pred vykonaním Automatického vypĺňania</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Globálna klávesová skratka Automatického vypĺňania</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation>Oneskorenie písania Auto-Type</translation>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation> ms</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation>Oneskorenia spustenia Auto-Type</translation>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>Časové limity</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>Vymazať schránku po</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>s</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>Zamknúť databázu po neaktivite</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>Pohodlie</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Zamknúť databázu pri zamknutí relácie alebo zatvorení krytu</translation>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>Zamknúť databázu pri minimalizovaní okna</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation>Znova zamknúť predtým zamknutú databázu po vykonaní Automatického vypĺňania</translation>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>Nevyžadovať opakovanie hesla, ak je viditeľné</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>Predvolene skryť  poznámky položky</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>Súkromie</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -216,6 +494,26 @@ Prosím, zvoľte, či chcete povoliť prístup.</translation>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Zrušiť</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -289,14 +587,6 @@ Prosím, zvoľte, či chcete povoliť prístup.</translation>
         <translation>Zoradiť vyhovujúce údaje podľa p&amp;už. mena</translation>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>O&amp;pojiť všetky prehliadače</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>Zabudnúť všetky zapamätané &amp;povolenia</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>Pokročilé</translation>
     </message>
@@ -362,14 +652,6 @@ Prosím, zvoľte, či chcete povoliť prístup.</translation>
         <translation>&lt;b&gt;Upozornenie:&lt;/b&gt; nasledujúce voľby môžu byť nebezpečné!</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>Spustiteľné súbory (*.exe);;Všetky súbory(*.*)</translation>
-    </message>
-    <message>
-        <source>Executable Files (*)</source>
-        <translation>Spustiteľné súbory (*)</translation>
-    </message>
-    <message>
         <source>Select custom proxy location</source>
         <translation>Zvoliť vlastné umiestnenie proxy</translation>
     </message>
@@ -377,6 +659,31 @@ Prosím, zvoľte, či chcete povoliť prístup.</translation>
         <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
         <translation>Prepáčte, ale KeePassXC-Prehliadač nie je v súčasnosti podporovaný pre vydania Snap.</translation>
     </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation>Aby fungovala integrácia do prehliadača, je potrebný KeePassXC-Browser. &lt;br /&gt;Stiahnuť pre %1 a %2.</translation>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation type="unfinished"/>
+    </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: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not ask permission for HTTP &amp;Basic Auth</source>
+        <extracomment>An extra HTTP Basic Auth setting</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>BrowserService</name>
@@ -417,153 +724,43 @@ Chcete ho prepísať?</translation>
         <translation>Chcete upraviť informácie v %1 – %2?</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Databáza zamknutá!</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Aktívna databáza je zamknutá!
-Prosím, odomknite zvolenú databázu alebo zvoľte inú, ktorá nie je zamknutá.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Nastavenia nie sú dostupné!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation>Aktívna databáza neobsahuje položku nastavenia.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Nenájdené žiadne kľúče</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation>V nastavenia KeePassXC neboli nájdené žiadne šifrovacie kľúče.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Klúče odstránené z databázy</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation><numerusform>Úspešne odstránený %n šifrovací kľúč z nastavení KeePassXC.</numerusform><numerusform>Úspešne odstránené %n šifrovacie kľúče z nastavení KeePassXC.</numerusform><numerusform>Úspešne odstránených %n šifrovacích kľúčov z nastavení KeePassXC.</numerusform><numerusform>Úspešne odstránených %n šifrovacích kľúčov z nastavení KeePassXC.</numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>Odstraňovanie uložených povolení…</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>Zrušiť</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Povolenia odstránené</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation><numerusform>Úspešne odstránené povolenia z %n položky.</numerusform><numerusform>Úspešne odstránené povolenia z %n položiek.</numerusform><numerusform>Úspešne odstránené povolenia z %n položiek.</numerusform><numerusform>Úspešne odstránené povolenia z %n položiek.</numerusform></translation>
+        <source>Converting attributes to custom data…</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Nenájdená žiadna položka s povoleniami!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Aktívna databáza neobsahuje položku s povoleniami.</translation>
-    </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>Heslo</translation>
-    </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>Zadajte heslo:</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>Zopakujte heslo:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>Súbor &amp;kľúča</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>Prechádzať</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Vytvoriť</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>Vý&amp;zva – Odpoveď</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Obnoviť</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>Súbory kľúčov</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>Všetky súbory</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>Vytvoriť súbor kľúča...</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>Nemožno vytvoriť súbor kľúča:</translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>Zvoľte súbor kľúča</translation>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty password</source>
-        <translation>Prázdne heslo</translation>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>Naozaj chcete použiť prázdny reťazec ako heslo?</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Different passwords supplied.</source>
-        <translation>Zadané heslá s líšia.</translation>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>Zlyhalo nastavenie %1 ako súboru kľúča:
-%2</translation>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Legacy key file format</source>
-        <translation>Starý formát kľúča</translation>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation type="unfinished"/>
     </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>Používate starý formát súboru kľúča, ktorý už nemusí byť
-v budúcnosti podporovaný .
-
-Prosím, zvážte vygenerovanie nového súboru kľúča.</translation>
-    </message>
-    <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>Zmena hlavného kľúča zlyhala: nie je vložený YubiKey.</translation>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -644,14 +841,6 @@ Prosím, zvážte vygenerovanie nového súboru kľúča.</translation>
         <translation>Neexistuje v súbore CSV</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>Prázdny názov poľa</translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>stĺpec</translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>Importované zo súboru CSV</translation>
     </message>
@@ -660,48 +849,84 @@ Prosím, zvážte vygenerovanie nového súboru kľúča.</translation>
         <translation>Pôvodné dáta:</translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>V súbore CSV zistená chyba(y)!</translation>
+        <source>Error</source>
+        <translation>Chyba</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation>ďalšie správy preskočené]</translation>
+        <source>Empty fieldname %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Chyba</translation>
+        <source>column %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>Import CSV: zapisovač má chyby:
-</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>Chyba</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Nemožno vypočítať hlavný kľúč</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
-        <translation><numerusform>%n bajt</numerusform><numerusform>%n bajty</numerusform><numerusform>%n bajtov</numerusform><numerusform>%n bajtov</numerusform></translation>
+        <source>%n column(s)</source>
+        <translation><numerusform>%n stĺpec</numerusform><numerusform>%n stĺpce</numerusform><numerusform>%n stĺpcov</numerusform><numerusform>%n stĺpcov</numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
-        <translation><numerusform>%n riadok</numerusform><numerusform>%n riadky</numerusform><numerusform>%n riadkov</numerusform><numerusform>%n riadkov</numerusform></translation>
+        <source>%n byte(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
-        <translation><numerusform>%n stĺpec</numerusform><numerusform>%n stĺpce</numerusform><numerusform>%n stĺpcov</numerusform><numerusform>%n stĺpcov</numerusform></translation>
+        <source>%n row(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Koreň</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -731,14 +956,6 @@ Prosím, zvážte vygenerovanie nového súboru kľúča.</translation>
         <translation>Výzva – odpoveď:</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Nemožno otvoriť databázu.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Nemožno otvoriť súbor kľúča</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation>Starý formát kľúča</translation>
     </message>
@@ -768,105 +985,168 @@ Prosím, zvážte vygenerovanie nového súboru kľúča.</translation>
         <source>Select key file</source>
         <translation>Zvoľte súbor kľúča</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>Opraviť databázu</translation>
+        <source>TouchID for quick unlock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Chyba</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Nemožno otvoriť súbor kľúča</translation>
+        <source>Can't open key file:
+%1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Nemožno otvoriť databázu.</translation>
+        <source>Passwords</source>
+        <translation>Heslá</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
+    <message>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Všeobecné</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Databáza úspešne otvorená. Nič netreba vykonať.</translation>
+        <source>Security</source>
+        <translation>Bezpečnosť</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>Úspešné</translation>
+        <source>Master Key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>Databáza bola úspešne opravená
-Môžete ju teraz uložiť.</translation>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>Nemožno opraviť databázu.</translation>
+        <source>Browser Integration</source>
+        <translation>Integrácia prehliadača</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>Všeobecné</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>Šifrovanie</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>O&amp;pojiť všetky prehliadače</translation>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Počet prechodov príliš vysoký</translation>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation type="unfinished"/>
     </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>Zadali ste príliš vysoký počet prechodov transformácie kľúča pre Argon2.
-
-Ak ponecháte toto číslo, môže otvorenie databázy trvať hodiny alebo i dni (dokonca i dlhšie)!</translation>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Understood, keep number</source>
-        <translation>Rozumiem, nechať hodnotu</translation>
+        <source>Stored keys</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>Zrušiť</translation>
+        <source>Remove</source>
+        <translation>Odstrániť</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Počet prechodov príliš nízky</translation>
+        <source>Delete the selected key?</source>
+        <translation type="unfinished"/>
     </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>Zadali ste príliš nízky počet prechodov transformácie kľúča pre Argon2.
-
-Ak ponecháte toto číslo, môže byť prelomenie ochrany databázy príliš jednoduché!</translation>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KDF unchanged</source>
-        <translation>KDF nezmenené</translation>
+        <source>Key</source>
+        <translation>Kľúč</translation>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
-        <translation>Zlyhala transformácia kľúča s novými parametrami KDF; KDF nezmenené.</translation>
+        <source>Value</source>
+        <translation>Hodnota</translation>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Nenájdené žiadne kľúče</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Klúče odstránené z databázy</translation>
     </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
-        <translation><numerusform> MiB</numerusform><numerusform> MiB</numerusform><numerusform> MiB</numerusform><numerusform> MiB</numerusform></translation>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Odstraňovanie uložených povolení…</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Zrušiť</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Povolenia odstránené</translation>
     </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
-        <translation><numerusform>vlákno</numerusform><numerusform>vlákna</numerusform><numerusform>vlákien</numerusform><numerusform>vlákien</numerusform></translation>
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: Nenájdená žiadna položka s povoleniami!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Aktívna databáza neobsahuje položku s povoleniami.</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
     </message>
 </context>
 <context>
@@ -903,6 +1183,113 @@ Ak ponecháte toto číslo, môže byť prelomenie ochrany databázy príliš je
         <source>Parallelism:</source>
         <translation>Paralelizmus:</translation>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Počet prechodov príliš vysoký</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>Zadali ste príliš vysoký počet prechodov transformácie kľúča pre Argon2.
+
+Ak ponecháte toto číslo, môže otvorenie databázy trvať hodiny alebo i dni (dokonca i dlhšie)!</translation>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation>Rozumiem, nechať hodnotu</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Zrušiť</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Počet prechodov príliš nízky</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>Zadali ste príliš nízky počet prechodov transformácie kľúča pre Argon2.
+
+Ak ponecháte toto číslo, môže byť prelomenie ochrany databázy príliš jednoduché!</translation>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation>KDF nezmenené</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation>Zlyhala transformácia kľúča s novými parametrami KDF; KDF nezmenené.</translation>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -952,91 +1339,110 @@ Ak ponecháte toto číslo, môže byť prelomenie ochrany databázy príliš je
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>Koreň</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Databáza KeePass 2</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Všetky súbory</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Otvoriť databázu</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>Súbor nenájdený!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Nemožno otvoriť databázu.</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>Súbor otvorený v režime len na čítanie.</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>Otvoriť súbor CSV</translation>
+        <source>Add additional protection...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>Súbor CSV</translation>
+        <source>No encryption key added</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>Všetky súbory (*)</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Zlúčiť databázu</translation>
+        <source>No password set</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Otvoriť databázu KeePass 1</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 type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>Databáza KeePass 1</translation>
+        <source>Unknown error</source>
+        <translation>Neznáma chyba</translation>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>Zatvoriť?</translation>
+        <source>Failed to change master key</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>„%1” je v režime úprav.
-Zahodiť zmeny a zatvoriť?</translation>
+        <source>Database Name:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>Uložiť zmeny?</translation>
+        <source>Description:</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>„%1” bol zmenený.
-Uložiť zmeny?</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Databáza KeePass 2</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Zápis databázy zlyhal.</translation>
+        <source>All files</source>
+        <translation>Všetky súbory</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Heslá</translation>
+        <source>Open database</source>
+        <translation>Otvoriť databázu</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Uložiť databázu ako</translation>
+        <source>CSV file</source>
+        <translation>Súbor CSV</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>Zlúčiť databázu</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Otvoriť databázu KeePass 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>Databáza KeePass 1</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1047,40 +1453,40 @@ Uložiť zmeny?</translation>
         <translation>Zápis do súboru CSV zlyhal.</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>Nová databáza</translation>
+        <source>Database creation error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>locked</source>
-        <translation>zamknuté</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 type="unfinished"/>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>Zamknúť databázu</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>Databázu nemožno zamknúť, práve ju upravujete.
-Prosím, zvoľte Zrušiť na dokončenie svojich úprav alebo ich zahoďte.</translation>
+        <source>Select CSV file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>Táto databáza bola zmenená.
-Chcete uložiť zmeny pred jej uzamknutím?
-Inak budú zmeny stratené.</translation>
+        <source>New Database</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disable safe saves?</source>
-        <translation>Vypnúť bezpečné ukladanie?</translation>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
     </message>
     <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 pri ukladaní databázy viac krát zlyhal. Pravdepodobne to je spôsobené službou synchronizácie súborov, ktorá drží zámok na ukladanom súbore.
-Vypnúť bezpečné ukladanie a skúsiť znova?</translation>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1090,37 +1496,13 @@ Vypnúť bezpečné ukladanie a skúsiť znova?</translation>
         <translation>Hľadanie…</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>Zmeniť hlavný kľúč</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>Odstrániť položku?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>Naozaj chcete nadobro odstrániť položku „%1”?</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Odstrániť položky?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Naozaj chcete nadobro odstrániť %1 položky?</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Presunúť položku do koša?</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation>Naozaj chcete presunúť položku „%1” do koša?</translation>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Presunúť položky do koša?</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation><numerusform>Naozaj chcete presunúť %1 položku do koša?</numerusform><numerusform>Naozaj chcete presunúť %1 položky do koša?</numerusform><numerusform>Naozaj chcete presunúť %1 položiek do koša?</numerusform><numerusform>Naozaj chcete presunúť %1 položiek do koša?</numerusform></translation>
@@ -1138,18 +1520,10 @@ Vypnúť bezpečné ukladanie a skúsiť znova?</translation>
         <translation>Zapamätať si moju voľbu</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Odstrániť skupinu?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>Naozaj chcete nadobro odstrániť skupinu „%1”?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Nemožno vypočítať hlavný kľúč</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>Žiadna otvorená databáza.</translation>
     </message>
@@ -1184,10 +1558,6 @@ Do you want to merge your changes?</source>
 Chcete zlúčiť svoje zmeny?</translation>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>Pri pokuse o automatické načítanie tejto databázy nemožno otvoriť nový súbor databázy.</translation>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>Vyprázdniť kôš?</translation>
     </message>
@@ -1195,88 +1565,104 @@ Chcete zlúčiť svoje zmeny?</translation>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>Naozaj chcete na trvalo odstrániť všetko zo svojho koša?</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>Generovať token TOPT</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Zatvoriť</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Súbor otvorený v režime len na čítanie.</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Všeobecné</translation>
+        <source>Lock Database?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Heslo</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>„%1” bol zmenený.
+Uložiť zmeny?</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>Platí do</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Používateľské meno</translation>
+        <source>Save changes?</source>
+        <translation>Uložiť zmeny?</translation>
     </message>
     <message>
-        <source>Autotype</source>
-        <translation>Automatické vypĺňanie</translation>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>Hľadanie</translation>
+        <source>Disable safe saves?</source>
+        <translation>Vypnúť bezpečné ukladanie?</translation>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>Atribúty</translation>
+        <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 pri ukladaní databázy viac krát zlyhal. Pravdepodobne to je spôsobené službou synchronizácie súborov, ktorá drží zámok na ukladanom súbore.
+Vypnúť bezpečné ukladanie a skúsiť znova?</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Prílohy</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Poznámky</translation>
+        <source>Passwords</source>
+        <translation>Heslá</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>Okno</translation>
+        <source>Save database as</source>
+        <translation>Uložiť databázu ako</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>Postupnosť</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Databáza KeePass 2</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Hľadať</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Vymazať</translation>
+        <source>Delete group</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Never</source>
-        <translation>Nikdy</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[CHRÁNENÉ]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>Vypnuté</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Zapnuté</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1350,22 +1736,10 @@ Chcete zlúčiť svoje zmeny?</translation>
         <translation>Nový atribút</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Potvrďte odstránenie</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>Naozaj chcete odstrániť tento atribút?</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[CHRÁNENÉ]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation>Použite Odkryť, na zobrazenie alebo úpravu</translation>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>Zajtra</translation>
     </message>
@@ -1378,10 +1752,6 @@ Chcete zlúčiť svoje zmeny?</translation>
         <translation><numerusform>%n mesiacoch</numerusform><numerusform>%n mesiacoch</numerusform><numerusform>%n mesiacoch</numerusform><numerusform>%n mesiacoch</numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 rok</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation>Použiť generované heslo?</translation>
     </message>
@@ -1393,6 +1763,26 @@ Chcete zlúčiť svoje zmeny?</translation>
         <source>Entry updated successfully.</source>
         <translation>Položka úspešne zmenená.</translation>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1638,6 +2028,81 @@ Chcete zlúčiť svoje zmeny?</translation>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulár</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Heslo:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1695,10 +2160,6 @@ Chcete zlúčiť svoje zmeny?</translation>
         <translation>Nemožno stiahnuť ikonu stránky</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Tip: Môžete zapnúť Google ako poslednú záchranu v Nástroje &gt; Nastavenia &gt; Bezpečnosť</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>Obrázky</translation>
     </message>
@@ -1707,14 +2168,6 @@ Chcete zlúčiť svoje zmeny?</translation>
         <translation>Všetky súbory</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Zvoľte obrázok</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read icon</source>
-        <translation>Nemožno načítať ikonu</translation>
-    </message>
-    <message>
         <source>Custom icon already exists</source>
         <translation>Vlastná ikona už existuje</translation>
     </message>
@@ -1723,8 +2176,36 @@ Chcete zlúčiť svoje zmeny?</translation>
         <translation>Potvrďte odstránenie</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>Táto ikona je použitá %1 položkou(ami) a bude nahradená predvolenou ikonou. Naozaj ju chcete odstrániť?</translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1775,9 +2256,8 @@ Môže to spôsobiť nefunkčnosť dotknutých zásuvných modulov.</translation
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation>– Klonovať</translation>
+        <source>%1 - Clone</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1822,10 +2302,6 @@ Môže to spôsobiť nefunkčnosť dotknutých zásuvných modulov.</translation
         <translation><numerusform>Naozaj chcete odstrániť %n prílohu?</numerusform><numerusform>Naozaj chcete odstrániť %n prílohy?</numerusform><numerusform>Naozaj chcete odstrániť %n príloh?</numerusform><numerusform>Naozaj chcete odstrániť %n príloh?</numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Potvrďte odstránenie</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>Uložiť prílohy</translation>
     </message>
@@ -1862,10 +2338,13 @@ Môže to spôsobiť nefunkčnosť dotknutých zásuvných modulov.</translation
 %1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>Nemožno otvoriť súbory:
-%1</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1949,6 +2428,106 @@ Môže to spôsobiť nefunkčnosť dotknutých zásuvných modulov.</translation
         <source>Attachments</source>
         <translation>Prílohy</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>Generovať token TOPT</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Zatvoriť</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Všeobecné</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Použ. meno:</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Heslo</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Platí do</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>Atribúty</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Prílohy</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Poznámky</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Automatické vypĺňanie</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Okno</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Postupnosť</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Hľadanie</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Hľadať</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Vymazať</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Nikdy</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[CHRÁNENÉ]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Zapnuté</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Vypnuté</translation>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EntryView</name>
@@ -1987,6 +2566,19 @@ Môže to spôsobiť nefunkčnosť dotknutých zásuvných modulov.</translation
         <source>Recycle Bin</source>
         <translation>Kôš</translation>
     </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>HostInstaller</name>
@@ -2000,61 +2592,6 @@ Môže to spôsobiť nefunkčnosť dotknutých zásuvných modulov.</translation
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>Dĺžka:</translation>
-    </message>
-    <message>
-        <source>Character Types</source>
-        <translation>Typy znakov</translation>
-    </message>
-    <message>
-        <source>Upper Case Letters</source>
-        <translation>Veľké písmená</translation>
-    </message>
-    <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
-    </message>
-    <message>
-        <source>Lower Case Letters</source>
-        <translation>Malé písmená</translation>
-    </message>
-    <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
-    </message>
-    <message>
-        <source>Numbers</source>
-        <translation>Číslice</translation>
-    </message>
-    <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
-    </message>
-    <message>
-        <source>Special Characters</source>
-        <translation>Špeciálne znaky</translation>
-    </message>
-    <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
-    </message>
-    <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Vynechať podobne vyzerajúce znaky</translation>
-    </message>
-    <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>Zaistiť aby heslo obsahovalo znaky každej skupiny</translation>
-    </message>
-    <message>
-        <source>Extended ASCII</source>
-        <translation>Rozšírené ASCII</translation>
-    </message>
-</context>
-<context>
     <name>KMessageWidget</name>
     <message>
         <source>&amp;Close</source>
@@ -2079,6 +2616,26 @@ Môže to spôsobiť nefunkčnosť dotknutých zásuvných modulov.</translation
         <source>Wrong key or database file is corrupt.</source>
         <translation>Zlý kľúč alebo je súbor databázy poškodený.</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation>chýbajúce hlavičky databázy</translation>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>Neplatná veľkosť ID hlavičky</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>Neplatná dĺžka poľa hlavičky</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>Neplatná dĺžka dát hlavičky</translation>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2239,10 +2796,6 @@ Môže to spôsobiť nefunkčnosť dotknutých zásuvných modulov.</translation
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation>Neplatná dĺžka UUID šifry</translation>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation>Nepodporovaná šifra</translation>
     </message>
@@ -2296,6 +2849,18 @@ Je to jednosmerná migrácia. Importovanú databázu už nebude možné otvoriť
         <source>Unsupported KeePass 2 database version.</source>
         <translation>Nepodporovaná verzia databázy KeePass 2.</translation>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2368,10 +2933,6 @@ Je to jednosmerná migrácia. Importovanú databázu už nebude možné otvoriť
         <translation>Prvok histórie s iným UUID</translation>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation>Nemožno dešifrovať text položky</translation>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation>Nájdený duplicitný vlastný atribút</translation>
     </message>
@@ -2420,6 +2981,12 @@ Je to jednosmerná migrácia. Importovanú databázu už nebude možné otvoriť
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation>Nemožno dekomprimovať binárku</translation>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2583,28 +3150,126 @@ Je to jednosmerná migrácia. Importovanú databázu už nebude možné otvoriť
         <source>Invalid entry field type</source>
         <translation>Neplatný typ poľa položky</translation>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>Existujúci súbor zámku jednej inštancie nie je platný. Spúšťam novú inštanciu.</translation>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>Súbor zámku nemožno vytvoriť. Režim jednej inštancie vypnutý.</translation>
+        <source>Import from</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Už je spustená iná inštancia KeePassXC.</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Fatálna chyba pri testovaní kryptografických funkcií.</translation>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC – Chyba</translation>
+        <source>Key Component</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Zrušiť</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>Prechádzať</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Generovať</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation>Starý formát kľúča</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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Súbory kľúčov</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Všetky súbory</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Vytvoriť súbor kľúča...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Zvoľte súbor kľúča</translation>
     </message>
 </context>
 <context>
@@ -2618,10 +3283,6 @@ Je to jednosmerná migrácia. Importovanú databázu už nebude možné otvoriť
         <translation>&amp;Nedávne databázy</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Importovať</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation>&amp;Pomocník</translation>
     </message>
@@ -2630,14 +3291,6 @@ Je to jednosmerná migrácia. Importovanú databázu už nebude možné otvoriť
         <translation>Polo&amp;žky</translation>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>Kopírovať at&amp;ribút do schránky</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation>Jednorázové heslo založené na čase (TOTP)</translation>
-    </message>
-    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Skupiny</translation>
     </message>
@@ -2666,30 +3319,10 @@ Je to jednosmerná migrácia. Importovanú databázu už nebude možné otvoriť
         <translation>&amp;Zatvoriť databázu</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>&amp;Nová databáza</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>Zlúčiť z databázy KeePassX</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>Pridať &amp;novú položku</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>&amp;Zobraziť/upraviť položku</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>O&amp;dstrániť položku</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>Pridať novú &amp;skupinu</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>&amp;Upraviť skupinu</translation>
     </message>
@@ -2702,14 +3335,6 @@ Je to jednosmerná migrácia. Importovanú databázu už nebude možné otvoriť
         <translation>Ul&amp;ožiť databázu ako…</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Zmeniť &amp;hlavný kľúč…</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>Nastavenia &amp;databázy</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>Nastavenia databázy</translation>
     </message>
@@ -2718,10 +3343,6 @@ Je to jednosmerná migrácia. Importovanú databázu už nebude možné otvoriť
         <translation>&amp;Klonovať položku</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>&amp;Nájsť</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>Kopírovať po&amp;už. meno</translation>
     </message>
@@ -2730,10 +3351,6 @@ Je to jednosmerná migrácia. Importovanú databázu už nebude možné otvoriť
         <translation>Skopíruje používateľské meno do schránky</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>Kopírovať &amp;heslo</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>Skopíruje heslo do schránky</translation>
     </message>
@@ -2746,14 +3363,6 @@ Je to jednosmerná migrácia. Importovanú databázu už nebude možné otvoriť
         <translation>Generátor hesla</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation>&amp;Vykonať Automatické vypĺňanie</translation>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>&amp;Otvoriť URL</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>Za&amp;mknúť databázy</translation>
     </message>
@@ -2786,22 +3395,6 @@ Je to jednosmerná migrácia. Importovanú databázu už nebude možné otvoriť
         <translation>&amp;Exportovať do súboru CSV…</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Importovať databázu KeePass 1…</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>Importovať súbor CSV…</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>O&amp;praviť databázu..</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>Zobraziť TOTP</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>Nastaviť TOTP…</translation>
     </message>
@@ -2822,14 +3415,6 @@ Je to jednosmerná migrácia. Importovanú databázu už nebude možné otvoriť
         <translation>Chyba prístupu ku konfiguračnému súboru %1</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Zdá sa, že na integráciu prehliadača používate KeePassHTTP. Táto možnosť je zastaraná a bude v budúcnosti odstránená.&lt;br&gt;Prosím, prejdite namiesto toho na na KeePassXC-Prehliadač! na pomoc s migráciou, navštívte našu &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;príručku migrácie&lt;/a&gt; (upozornenie %1 z 3).&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>len na čítanie</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Nastavenia</translation>
     </message>
@@ -2842,36 +3427,278 @@ Je to jednosmerná migrácia. Importovanú databázu už nebude možné otvoriť
         <translation>Skončiť KeePassXC</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Databáza KeePass 2</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Prosím, stlačte tlačidlo svojho YubiKey!</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Všetky súbory</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation>UPOZORNENIE: Používate nestabilné zostavenie KeePassXC!
+Existuje veľké riziko poškodenia, zálohujte svoje dtabázy.
+Táto verzia nie je určená na produkčné použitie.</translation>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Otvoriť databázu</translation>
+        <source>&amp;Donate</source>
+        <translation>&amp;Podporiť</translation>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Uložiť opravenú databázu</translation>
+        <source>Report a &amp;bug</source>
+        <translation>Nahlásiť &amp;chybu</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Zápis databázy zlyhal.</translation>
+        <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>UPOZORNENIE: Vaša verzia Qt môže spôsobiť pád KeePassXC s klávesnicou na obrazovke!
+Odporúčame použiť AppImage dostupný v našej stránke sťahovaní.</translation>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Prosím, stlačte tlačidlo svojho YubiKey!</translation>
+        <source>&amp;Import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
-        <translation>UPOZORNENIE: Používate nestabilné zostavenie KeePassXC!
-Existuje veľké riziko poškodenia, zálohujte svoje dtabázy.
-Táto verzia nie je určená na produkčné použitie.</translation>
+        <source>Copy att&amp;ribute...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Koreň</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2974,125 +3801,34 @@ Táto verzia nie je určená na produkčné použitie.</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation>Dialóg</translation>
-    </message>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>Toto je vyžadované na prístup k databázam z ChromeIPass alebo PassIFox</translation>
-    </message>
-    <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>Zapnúť server KeePassHTTP</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Všeobecné</translation>
-    </message>
-    <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>Z&amp;obraziť upozornenie, keď sú požadované údaje</translation>
-    </message>
-    <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>Vrátiť len najlepšie zhody danej URL, namiesto všetkých položiek celej domény.</translation>
-    </message>
-    <message>
-        <source>&amp;Return only best matching entries</source>
-        <translation>V&amp;rátiť len položky s najlepšou zhodou</translation>
-    </message>
-    <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Po&amp;žiadať o odomknutie databázy, ak je zamknutá</translation>
-    </message>
-    <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation>Vrátené budú len položky s rovnakou schémou (http://, https://, ftp://, ...).</translation>
-    </message>
-    <message>
-        <source>&amp;Match URL schemes</source>
-        <translation>Zhoda sché&amp;m URL</translation>
-    </message>
-    <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Zoradiť vyhovujúce položky podľa p&amp;už. mena</translation>
-    </message>
-    <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Zoradiť vyhovujúce položky podľa &amp;názvu</translation>
-    </message>
-    <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>Odstrániť vš&amp;etky zdieľané šifrovacie kľúče z aktívnej databázy</translation>
-    </message>
-    <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>Odstrániť všetky uložené povolenia z položiek aktívnej databázy</translation>
-    </message>
-    <message>
-        <source>Password Generator</source>
-        <translation>Generátor hesla</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Pokročilé</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Vždy povoliť &amp;prístup k položkám</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Vždy povoliť &amp;úpravu položiek</translation>
-    </message>
-    <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>S klientom má byť pripojená len zvolená databáza.</translation>
-    </message>
-    <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>&amp;Hľadať vyhovujúce položky vo všetkých databázach</translation>
-    </message>
-    <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>Automatické vytváranie alebo úprava textových polí nie je podporovaná.</translation>
-    </message>
-    <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>V&amp;rátiť reťazce pokročilých polí, ktoré začínajú na „KPH: ”</translation>
-    </message>
-    <message>
-        <source>HTTP Port:</source>
-        <translation>Port HTTP:</translation>
+        <source>Enter password:</source>
+        <translation>Zadajte heslo:</translation>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Predvolený port: 19455</translation>
+        <source>Confirm password:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC bude prijímať na tomto porte na 127.0.0.1</translation>
+        <source>Password</source>
+        <translation>Heslo</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;Upozornenie:&lt;/b&gt; nasledujúce voľby môžu byť nebezpečné!</translation>
+        <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"/>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;KeePassHTTP je zastarané a bude v budúcnosti odstránené.&lt;br&gt;Prosím, prejdite namiesto toho na na KeePassXC-Prehliadač! na pomoc s migráciou, navštívte našu &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;príručku migrácie.&lt;/p&gt;</translation>
+        <source>Password cannot be empty.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Nemožno použiť privilegované porty</translation>
+        <source>Passwords do not match.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Nemožno použiť privilegované porty pod 1204!
-Použitý predvolený port 19455.</translation>
+        <source>Generate master password</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3163,18 +3899,10 @@ Použitý predvolený port 19455.</translation>
         <translation>Zoznam slov:</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Počet slov:</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>Oddeľovač slov:</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>Generovať</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Kopírovať</translation>
     </message>
@@ -3187,10 +3915,6 @@ Použitý predvolený port 19455.</translation>
         <translation>Zatvoriť</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>Použiť</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>Náhodnosť: %1 b</translation>
     </message>
@@ -3218,6 +3942,171 @@ Použitý predvolený port 19455.</translation>
         <comment>Password quality</comment>
         <translation>Výbroné</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Pokročilé</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Ž</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-ž</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Odstrániť</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Odstrániť</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Vypnúť</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3238,34 +4127,18 @@ Použitý predvolený port 19455.</translation>
         <translation>Nemožno dešifrovať správu</translation>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
-        <translation>Uplynul časový limit alebo sa ku KeePassXC nemožno pripojiť </translation>
-    </message>
-    <message>
         <source>Action cancelled or denied</source>
         <translation>Akcia zrušená alebo odmietnutá</translation>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation>Nemožno zašifrovať správu alebo nebol nájdený verejný kľúč. Je v KeePassXC zapnuté posielanie správ medzi prehliadačom a KeePassXC (native messaging)?</translation>
-    </message>
-    <message>
         <source>KeePassXC association failed, try again</source>
         <translation>Spojenie s KeePassXC zlyhalo, skúste znova</translation>
     </message>
     <message>
-        <source>Key change was not successful</source>
-        <translation>Zmena kľúča nebola úspešná</translation>
-    </message>
-    <message>
         <source>Encryption key is not recognized</source>
         <translation>Šifrovací kľúč nerozpoznaný</translation>
     </message>
     <message>
-        <source>No saved databases found</source>
-        <translation>Neboli nájdené uložené databázy</translation>
-    </message>
-    <message>
         <source>Incorrect action</source>
         <translation>Nesprávna akcia</translation>
     </message>
@@ -3391,10 +4264,6 @@ Použitý predvolený port 19455.</translation>
         <translation>Na odomknutie zadajte heslo: %1</translation>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation>Zlyhalo načítanie súboru kľúča %1 : %2</translation>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3479,11 +4348,6 @@ Dostupné príkazy:
         <translation>chyba čítania zo zariadenia</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>súbor je prázdny!</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation>zlý formát reťazca</translation>
     </message>
@@ -3492,30 +4356,6 @@ Dostupné príkazy:
         <translation>chýba koncová úvodzovka</translation>
     </message>
     <message>
-        <source>AES: 256-bit</source>
-        <translation>AES: 256-b</translation>
-    </message>
-    <message>
-        <source>Twofish: 256-bit</source>
-        <translation>Twofish: 256-b</translation>
-    </message>
-    <message>
-        <source>ChaCha20: 256-bit</source>
-        <translation>ChaCha20: 256-b</translation>
-    </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – odporúčané)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 4)</source>
-        <translation>AES-KDF (KDBX 4)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 3.1)</source>
-        <translation>AES-KDF (KDBX 3.1)</translation>
-    </message>
-    <message>
         <source>Group</source>
         <translation>Skupina</translation>
     </message>
@@ -3544,10 +4384,6 @@ Dostupné príkazy:
         <translation>Vytvorené</translation>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
-        <translation>Stará integrácia prehliadača</translation>
-    </message>
-    <message>
         <source>Browser Integration</source>
         <translation>Integrácia prehliadača</translation>
     </message>
@@ -3576,10 +4412,6 @@ Dostupné príkazy:
         <translation>Počet slov pre diceware tajnú vetu.</translation>
     </message>
     <message>
-        <source>count</source>
-        <translation>počet</translation>
-    </message>
-    <message>
         <source>Wordlist for the diceware generator.
 [Default: EFF English]</source>
         <translation>Zoznam slov pre generátor diceware.
@@ -3590,28 +4422,438 @@ Dostupné príkazy:
         <translation>Generovať nové náhodné heslo.</translation>
     </message>
     <message>
-        <source>Length of the generated password.</source>
-        <translation>Dĺžka generovaného hesla.</translation>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
-        <translation>V generovanom hesle použiť malé písmená.</translation>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
-        <translation>V generovanom hesle použiť veľké písmená.</translation>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
-        <translation>V generovanom hesle použiť číslice.</translation>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
-        <translation>V generovanom hesle použiť špeciálne znaky.</translation>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
-        <translation>V generovanom hesle použiť rozšírené ASCII.</translation>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation>počet</translation>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256-b</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256-b</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256-b</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – odporúčané)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>Odstrániť položku z databázy.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>Cesta položky na odstránenie.</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>Existujúci súbor zámku jednej inštancie nie je platný. Spúšťam novú inštanciu.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Súbor zámku nemožno vytvoriť. Režim jednej inštancie vypnutý.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC – multi-platformový správca hesiel</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>mená súborov databáz hesiel na otvorenie (*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>cesta k vlastnému konfiguračnému súboru</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>súbor kľúča databázy</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>čítať heslo databázy zo stdin</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation>ID rodičovského okna</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Už je spustená iná inštancia KeePassXC.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Fatálna chyba pri testovaní kryptografických funkcií.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC – Chyba</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation>Heslo databázy:</translation>
     </message>
 </context>
 <context>
@@ -3649,12 +4891,98 @@ Dostupné príkazy:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
     <message>
-        <source>Search...</source>
-        <translation>Hľadanie…</translation>
+        <source>Agent connection failed.</source>
+        <translation>Spojenie agenta zlyhalo.</translation>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation>Chyba protokolu agenta.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation>Nie je spustený žiadny agent, nemožno identifikovať.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation>Nie je spustený žiadny agent, nemožno odstrániť identitu.</translation>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation>Agent odmietol túto identitu. Možné príčiny:</translation>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation>Kľúč už bol pridaný.</translation>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation>Obmedzená doba platnosti nie je agentom podporovaná (skontrolujte voľby)</translation>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation>Potrvrdzovací požiadavok nie je podporovaný (skontrolujte voľby).</translation>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
         <source>Search</source>
         <translation>Hľadať</translation>
     </message>
@@ -3663,314 +4991,316 @@ Dostupné príkazy:
         <translation>Vymazať</translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Rozlišovať veľkosť písmen</translation>
-    </message>
-    <message>
         <source>Limit search to selected group</source>
         <translation>Obmedziť hľadanie na zvolenú skupinu</translation>
     </message>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Service</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC: Nová požiadavka priradenia kľúča</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation>Obdržali ste požiadavku na priradenie vyššie uvedeného kľúča.
-Ak mu chcete umožniť prístup do databázy KeePassXC,
-zadajte mu jedinečný názov na identifikáciu a potvrďte ho.</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: Prepísať existujúci kľúč?</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Zdieľaný šifrovací kľúč s menom „%1” už existuje.
-Chcete ho prepísať?</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: Upraviť položku</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Chcete upraviť informácie v %1 – %2?</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Databáza zamknutá!</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Aktívna databáza je zamknutá!
-Prosím, odomknite zvolenú databázu alebo zvoľte inú, ktorá nie je zamknutá.</translation>
+        <source>Key:</source>
+        <translation>Kľúč:</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Klúče odstránené z databázy</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation><numerusform>Úspešne odstránený %n šifrovací kľúč z nastavenia KeePassX/Http.</numerusform><numerusform>Úspešne odstránené %n šifrovacie kľúče z nastavenia KeePassX/Http.</numerusform><numerusform>Úspešne odstránených %n šifrovacích kľúčov z nastavenia KeePassX/Htt</numerusform><numerusform>Úspešne odstránených %n šifrovacích kľúčov z nastavenia KeePassX/Http.</numerusform></translation>
+        <source>Generate</source>
+        <translation>Generovať</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Nenájdené žiadne kľúče</translation>
+        <source>Import</source>
+        <translation>Importovať</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>Nenájdené žiadne šifrovacie kľúče v nastavení KeePassHttp.</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Nastavenia nie sú dostupné!</translation>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>Aktívna databáza neobsahuje položku nastavení KeePassHttp.</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>Odstraňovanie uložených povolení…</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>Zrušiť</translation>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Povolenia odstránené</translation>
+        <source>Remove</source>
+        <translation>Odstrániť</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation><numerusform>Úspešne odstránené povolenia z %n položky.</numerusform><numerusform>Úspešne odstránené povolenia z %n položiek.</numerusform><numerusform>Úspešne odstránené povolenia z %n položiek.</numerusform><numerusform>Úspešne odstránené povolenia z %n položiek.</numerusform></translation>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Nenájdená žiadna položka s povoleniami!</translation>
+        <source>Status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Aktívna databáza neobsahuje položku s povoleniami.</translation>
+        <source>Fingerprint</source>
+        <translation>Odtlačok</translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
-        <translation>Nastavenia aplikácie</translation>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Všeobecné</translation>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>Bezpečnosť</translation>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>Chyba prístupu ku konfiguračnému súboru %1</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>Základné nastavenia</translation>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Spustiť len jednu inštanciu KeePassXC</translation>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>Zapamätať posledné databázy</translation>
+        <source>All files</source>
+        <translation>Všetky súbory</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Zapamätať si posledné súbory kľúčov a bezpečnostných kľúčeniek</translation>
+        <source>Select path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Načítať predošlé databázy pri štarte</translation>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>Automaticky uložiť pri ukončení</translation>
+        <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"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>Automaticky uložiť po každej zmene</translation>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Automaticky načítať databázu, ak je upravená externe</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>Minimalizovať pri skopírovaní do schránky</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Minimalizovať okno pri spustení aplikácie</translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>Použiť  ikonu skupiny pri vytváraní položky</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Neoznačovať databázu za zmenenú pri nedátových zmenách (napr. rozbalenie skupiny)</translation>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
-        <translation>Skryť zobrazenie podrobností</translation>
+        <source>Never</source>
+        <translation>Nikdy</translation>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>Zobraziť ikonu v oznamovacej oblasti</translation>
+        <source>Always</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>Skryť okno do oznamovacej oblasti pri minimalizácii</translation>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
-        <translation>Skryť okno do oznamovacej oblasti namiesto ukončenia</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
-        <translation>Tmavá ikona oznamovacej oblasti</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>jazyk</translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Automatické vypĺňanie</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>Použiť názov položky na zhodu okna pre globálne Automatické vypĺňanie</translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>Použiť URL položky na zhodu okna pre globálne Automatické vypĺňanie</translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation>Vždy sa spýtať pred vykonaním Automatického vypĺňania</translation>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Globálna klávesová skratka Automatického vypĺňania</translation>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>Oneskorenie Automatického vypĺňania</translation>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation> ms</translation>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
-        <translation>Štart</translation>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
-        <translation>Správa súborov</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation>Bezpečne uložiť súbory databáz  (môže byť nekompatibilné Dropbox, apod)</translation>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
-        <translation>Zálohovať databázu pri každom uložení</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
-        <translation>Správa položky</translation>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Všeobecné</translation>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
-        <translation>Časové limity</translation>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>Vymazať schránku po</translation>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>s</translation>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>Zamknúť databázu po neaktivite</translation>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Pohodlie</translation>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Zamknúť databázu pri zamknutí relácie alebo zatvorení krytu</translation>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>Zamknúť databázu pri minimalizovaní okna</translation>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>TotpDialog</name>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>Nevyžadovať opakovanie hesla, ak je viditeľné</translation>
+        <source>Timed Password</source>
+        <translation>Časové heslo</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Predvolene zobraziť heslo prostým textom</translation>
+        <source>000000</source>
+        <translation>000000</translation>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
-        <translation>Skryť heslá v paneli ukážky</translation>
+        <source>Copy</source>
+        <translation>Kopírovať</translation>
     </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>
+    </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
     <message>
-        <source>Hide entry notes by default</source>
-        <translation>Predvolene skryť  poznámky položky</translation>
+        <source>Copy</source>
+        <translation>Kopírovať</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>Súkromie</translation>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>Použiť Google ako poslednú záchranu pri sťahovaní ikon webovej stránky</translation>
+        <source>There was an error creating the QR code.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
-        <translation>Znova zamknúť predtým zamknutú databázu po vykonaní Automatického vypĺňania</translation>
+        <source>Closing in %1 seconds.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation>Nastaviť TOTP</translation>
@@ -3992,59 +5322,84 @@ Prosím, odomknite zvolenú databázu alebo zvoľte inú, ktorá nie je zamknut�
         <translation>Použiť vlastné nastavenia</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>Poznámka: Zmeňte tieto nastavenia, len ak viete čo robíte.</translation>
+        <source>Custom Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Time step:</source>
         <translation>Časový krok:</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8 číslic</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>s</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>Veľkosť kódu:</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6 číslic</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>Veľkosť kódu:</translation>
+        <source>7 digits</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>s</translation>
+        <source>8 digits</source>
+        <translation>8 číslic</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>Časové heslo</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Kopírovať</translation>
+        <source>Close</source>
+        <translation>Zatvoriť</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>Vyprší za</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>s</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>Odomknúť databázu</translation>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4079,42 +5434,26 @@ Prosím, odomknite zvolenú databázu alebo zvoľte inú, ktorá nie je zamknut�
     </message>
 </context>
 <context>
-    <name>main</name>
-    <message>
-        <source>Remove an entry from the database.</source>
-        <translation>Odstrániť položku z databázy.</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>Cesta k databáze.</translation>
-    </message>
-    <message>
-        <source>Path of the entry to remove.</source>
-        <translation>Cesta položky na odstránenie.</translation>
-    </message>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC – multi-platformový správca hesiel</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>mená súborov databáz hesiel na otvorenie (*.kdbx)</translation>
+        <source>Refresh</source>
+        <translation>Obnoviť</translation>
     </message>
     <message>
-        <source>path to a custom config file</source>
-        <translation>cesta k vlastnému konfiguračnému súboru</translation>
+        <source>YubiKey Challenge-Response</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>súbor kľúča databázy</translation>
+        <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"/>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>čítať heslo databázy zo stdin</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Parent window handle</source>
-        <translation>ID rodičovského okna</translation>
+        <source>No YubiKey inserted.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_sl_SI.ts b/share/translations/keepassx_sl_SI.ts
index cec9bd6ca..e2ede67f9 100644
--- a/share/translations/keepassx_sl_SI.ts
+++ b/share/translations/keepassx_sl_SI.ts
@@ -10,20 +10,31 @@
         <translation>O programu</translation>
     </message>
     <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
         <source>Contributors</source>
         <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
         <source>Debug Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy to clipboard</source>
+        <source>Include the following information whenever you report a bug:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Version %1
-</source>
+        <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -31,6 +42,10 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Distribution: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Libraries:</source>
         <translation type="unfinished"/>
     </message>
@@ -45,51 +60,333 @@ Kernel: %3 %4</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <source>Project Maintainers:</source>
         <translation type="unfinished"/>
     </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>
+        <source>Special thanks from the KeePassXC team go to debfx for creating the original KeePassX.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Project Maintainers:</source>
+        <source>Version %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
+        <source>Build Type: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Include the following information whenever you report a bug:</source>
+        <source>Auto-Type</source>
+        <translation>Samodejno tipkanje</translation>
+    </message>
+    <message>
+        <source>Browser Integration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Distribution: %1</source>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>YubiKey</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>AccessControlDialog</name>
+    <name>AgentSettingsWidget</name>
     <message>
-        <source>Remember this decision</source>
+        <source>Enable SSH Agent (requires restart)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Allow</source>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Nastavitve aplikacije</translation>
+    </message>
     <message>
-        <source>Deny</source>
+        <source>General</source>
+        <translation>Splošno</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Varnost</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>%1 has requested access to passwords for the following item(s).
-Please select whether you want to allow access.</source>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Zapomni si zadnje podatkovne baze</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Samodejno shrani po vsaki spremembi</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Samodejno shrani ob izhodu</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>Za nove vnose uporabi ikono skupine</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Minimiziraj pri kopiranju v odložišče</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Splošno</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Pokaži ikono v sistemski vrstici</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Minimiziraj v sistemsko vrstico</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Jezik</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Samodejno tipkanje</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Globalna bližnjica za samodejno tipkanje</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>Pobriši odložišče po</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>sekundah</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>Zakleni podatkovne baze po neaktivnosti </translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -103,6 +400,26 @@ Please select whether you want to allow access.</source>
         <source>Auto-Type - KeePassXC</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Samodejno tipkanje</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoTypeAssociationsModel</name>
@@ -120,90 +437,322 @@ Please select whether you want to allow access.</source>
     </message>
 </context>
 <context>
+    <name>AutoTypeMatchModel</name>
+    <message>
+        <source>Group</source>
+        <translation>Skupina</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Naslov</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Uporabniško ime</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Sekvenca</translation>
+    </message>
+</context>
+<context>
     <name>AutoTypeSelectDialog</name>
     <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Select entry to Auto-Type:</source>
         <translation>Izberi vnos za samodejno tipkanje:</translation>
     </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
     <message>
-        <source>Auto-Type - KeePassXC</source>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember this decision</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"/>
+    </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"/>
     </message>
 </context>
 <context>
-    <name>ChangeMasterKeyWidget</name>
+    <name>BrowserEntrySaveDialog</name>
     <message>
-        <source>Password</source>
-        <translation>Geslo</translation>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enter password:</source>
-        <translation>Vnesi geslo:</translation>
+        <source>Ok</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Repeat password:</source>
-        <translation>Ponovi geslo:</translation>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Browse</source>
-        <translation>Prebrskaj</translation>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
     <message>
-        <source>Create</source>
-        <translation>Ustvari novo</translation>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key files</source>
-        <translation>Datoteke s ključi</translation>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Vse datoteke</translation>
+        <source>Enable KeepassXC browser integration</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Create Key File...</source>
-        <translation>Ustvari datoteko s ključi...</translation>
+        <source>General</source>
+        <translation>Splošno</translation>
     </message>
     <message>
-        <source>Unable to create Key File : </source>
-        <translation>Ustvarjanje datoteke s ključi ni uspelo:</translation>
+        <source>Enable integration for these browsers:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Select a key file</source>
-        <translation>Izberi datoteko s kljući</translation>
+        <source>&amp;Google Chrome</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>Ali res želite uporabiti prazen niz kot geslo?</translation>
+        <source>&amp;Firefox</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Different passwords supplied.</source>
-        <translation>Vnešeni gesli sta različni.</translation>
+        <source>&amp;Chromium</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>Nastavljanje %1 kot datoteko s ključi ni uspelo:
-%2</translation>
+        <source>&amp;Vivaldi</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Key file</source>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cha&amp;llenge Response</source>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Refresh</source>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty password</source>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Napredno</translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation type="unfinished"/>
+    </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: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not ask permission for HTTP &amp;Basic Auth</source>
+        <extracomment>An extra HTTP Basic Auth setting</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Converting attributes to custom data…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -214,15 +763,15 @@ Please select whether you want to allow access.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Replace username and password with references</source>
+        <source>Append &apos; - Clone&apos; to title</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy history</source>
+        <source>Replace username and password with references</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Append &apos; - Clone&apos; to title</source>
+        <source>Copy history</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -285,66 +834,91 @@ Please select whether you want to allow access.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty fieldname </source>
+        <source>Imported from CSV file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>column </source>
+        <source>Original data: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Imported from CSV file</source>
-        <translation type="unfinished"/>
+        <source>Error</source>
+        <translation>Napaka</translation>
     </message>
     <message>
-        <source>Original data: </source>
+        <source>Empty fieldname %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
+        <source>column %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source> more messages skipped]</source>
+        <source>Error(s) detected in CSV file!</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Error</source>
-        <translation>Napaka</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>CSV import: writer has errors:
-</source>
+%1</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CsvImportWizard</name>
+    <name>CsvParserModel</name>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
-        <source>Import CSV file</source>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Error</source>
-        <translation>Napaka</translation>
+    <message numerus="yes">
+        <source>%n byte(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source>Unable to calculate master key</source>
-        <translation>Izračun glavnega ključa ni uspel</translation>
+    <message numerus="yes">
+        <source>%n row(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
-    <name>CsvParserModel</name>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Koren</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <source> byte, </source>
+        <source>Error while reading the database: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source> rows, </source>
+        <source>Could not save, database has no file name.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source> columns</source>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -367,12 +941,27 @@ Please select whether you want to allow access.</source>
         <translation>Prebrskaj</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Odpiranje podatkovne baze ni uspelo.</translation>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Odpiranje datoteke s ključi ni uspelo</translation>
+        <source>Challenge Response:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>All files</source>
@@ -387,75 +976,328 @@ Please select whether you want to allow access.</source>
         <translation>Izberi datoteko s ključi</translation>
     </message>
     <message>
-        <source>Refresh</source>
+        <source>TouchID for quick unlock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Challenge Response:</source>
+        <source>Unable to open the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can't open key file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
+    <message>
+        <source>Passwords</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>DatabaseRepairWidget</name>
+    <name>DatabaseSettingsDialog</name>
     <message>
-        <source>Repair database</source>
+        <source>Advanced Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Napaka</translation>
+        <source>General</source>
+        <translation>Splošno</translation>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Odpiranje datoteke s ključi ni uspelo</translation>
+        <source>Security</source>
+        <translation>Varnost</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
+        <source>Master Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Odpiranje podatkovne baze ni uspelo.</translation>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetBrowser</name>
+    <message>
+        <source>KeePassXC-Browser settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Stored keys</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Odstrani</translation>
+    </message>
+    <message>
+        <source>Delete the selected key?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Success</source>
+        <source>KeePassXC: Removed permissions</source>
         <translation type="unfinished"/>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
+        <source>KeePassXC: No entry with permissions found!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetEncryption</name>
     <message>
-        <source>Database name:</source>
-        <translation>Ime podatkovne baze:</translation>
+        <source>Encryption Algorithm:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Database description:</source>
-        <translation>Opis podatkovne baze:</translation>
+        <source>AES:  256 Bit   (default)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish:  256 Bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Derivation Function:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Transform rounds:</source>
         <translation>Transform rounds:</translation>
     </message>
     <message>
-        <source>Default username:</source>
-        <translation>Privzeto uporabniško ime:</translation>
+        <source>Benchmark 1-second delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
+        <source>Database format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
         <source> MiB</source>
-        <translation> MiB</translation>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>Ime podatkovne baze:</translation>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation>Opis podatkovne baze:</translation>
     </message>
     <message>
-        <source>Benchmark</source>
-        <translation>Primerjalni preizkus (benchmark)</translation>
+        <source>Default username:</source>
+        <translation>Privzeto uporabniško ime:</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Max. history items:</source>
@@ -466,276 +1308,344 @@ You can now save it.</source>
         <translation>Max. velikost zgodovine:</translation>
     </message>
     <message>
-        <source>Use recycle bin</source>
-        <translation type="unfinished"/>
+        <source> MiB</source>
+        <translation> MiB</translation>
     </message>
     <message>
-        <source>AES:  256 Bit   (default)</source>
+        <source>Use recycle bin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Twofish:  256 Bit</source>
+        <source>Additional Database Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Algorithm:</source>
+        <source>Enable &amp;compression (recommended)</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <translation>Koren</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 podatkovna baza</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Vse datoteke</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Odpri podatkovno bazo</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>Datoteke ni mogoče najti!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Odpri KeePass 1 podatkovno bazo</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1 podatkovna baza</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>All files (*)</source>
-        <translation>Vse datoteke (*)</translation>
+        <source>Add additional protection...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>Zapri?</translation>
+        <source>No encryption key added</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>Shrani spremembe?</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>&quot;%1&quot; spremenjeno.
-Shrani spremembe?</translation>
+        <source>No password set</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Zapis podatkovne baze ni uspel.</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 type="unfinished"/>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Shrani podatkovno bazo kot</translation>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>New database</source>
-        <translation>Nova podatkovna baza</translation>
+        <source>Failed to change master key</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>locked</source>
-        <translation>zaklenjeno</translation>
+        <source>Database Name:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>Zakleni podatkovno bazo</translation>
+        <source>Description:</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>Podatkovna baza je trenutno v urejanju, zato je ni mogoče zakleniti.
-Dokončajte spremembe in poskusite znova.</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 podatkovna baza</translation>
     </message>
     <message>
-        <source>This database has never been saved.
-You can save the database or stop locking it.</source>
-        <translation>Podatkovna baza še ni bila shranjena.
-Lahko jo shranite ali prekinete z zaklepanjem.</translation>
+        <source>All files</source>
+        <translation>Vse datoteke</translation>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>Podatkovna baza je bila spremenjena.
-Ali jo želite shraniti?
-V nasprotnem primeru bodo spremembe izgubljene.</translation>
+        <source>Open database</source>
+        <translation>Odpri podatkovno bazo</translation>
     </message>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; je v urejanju.
-Zavrži spremembe in zapri?</translation>
+        <source>CSV file</source>
+        <translation>CSV datoteka</translation>
     </message>
     <message>
-        <source>Export database to CSV file</source>
-        <translation>Izvozi podatkovno bazo v CSV datoteko</translation>
+        <source>Merge database</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>CSV datoteka</translation>
+        <source>Open KeePass 1 database</source>
+        <translation>Odpri KeePass 1 podatkovno bazo</translation>
     </message>
     <message>
-        <source>Writing the CSV file failed.</source>
-        <translation>Pisanje v CSV datoteko ni uspelo</translation>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 podatkovna baza</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Odpiranje podatkovne baze ni uspelo.</translation>
+        <source>Export database to CSV file</source>
+        <translation>Izvozi podatkovno bazo v CSV datoteko</translation>
     </message>
     <message>
-        <source>Merge database</source>
+        <source>Writing the CSV file failed.</source>
+        <translation>Pisanje v CSV datoteko ni uspelo</translation>
+    </message>
+    <message>
+        <source>Database creation error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The database you are trying to save as is locked by another instance of KeePassXC.
-Do you want to save it anyway?</source>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Passwords</source>
+        <source>The database file does not exist or is not accessible.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Database already opened</source>
+        <source>Select CSV file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-
-Do you want to open it anyway?</source>
+        <source>New Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open read-only</source>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open CSV file</source>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DatabaseWidget</name>
     <message>
-        <source>Change master key</source>
-        <translation>Spremeni glavni ključ</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>Izbris vnosa?</translation>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>Ali res želite izbrisati &quot;%1&quot;?</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Izbris vnosov?</translation>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Ali res želite izbrisati %1 vnosov?</translation>
+    <message numerus="yes">
+        <source>Do you really want to move %n entry(s) to the recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Premik vnosov v koš?</translation>
+        <source>Execute command?</source>
+        <translation type="unfinished"/>
     </message>
-    <message numerus="yes">
-        <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation><numerusform>Ali res želite premakniti %n vnos v koš?</numerusform><numerusform>Ali res želite premakniti %n vnosa v koš?</numerusform><numerusform>Ali res želite premakniti %n vnose v koš?</numerusform><numerusform>Ali res želite premakniti %n - vnosov v koš?</numerusform></translation>
+    <message>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Izbris skupine?</translation>
+        <source>Remember my choice</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>Ali res želite izbrisati skupino &quot;%1&quot;?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Izračun glavnega ključa ni uspel</translation>
+        <source>No current database.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Move entry to recycle bin?</source>
+        <source>No source database, nothing to do.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <source>Search Results (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searching...</source>
+        <source>No Results</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>No current database.</source>
+        <source>File has changed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>No source database, nothing to do.</source>
+        <source>The database file has changed. Do you want to load the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Search Results (%1)</source>
+        <source>Merge Request</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>No Results</source>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Execute command?</source>
+        <source>Empty recycle bin?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation type="unfinished"/>
     </message>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
-        <source>Remember my choice</source>
+        <source>File opened in read only mode.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Autoreload Request</source>
+        <source>Lock Database?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The database file has changed. Do you want to load the changes?</source>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge Request</source>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot; spremenjeno.
+Shrani spremembe?</translation>
+    </message>
+    <message>
+        <source>Database was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save changes?</source>
+        <translation>Shrani spremembe?</translation>
+    </message>
+    <message>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
+        <source>Disable safe saves?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Empty recycle bin?</source>
+        <source>Writing the database failed.
+%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
+        <source>Passwords</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save database as</source>
+        <translation>Shrani podatkovno bazo kot</translation>
+    </message>
+    <message>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 podatkovna baza</translation>
+    </message>
+    <message>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Delete group</source>
+        <translation>Izbriši skupino</translation>
+    </message>
+    <message>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database was not modified by merge operation.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -766,6 +1676,30 @@ Do you want to open it anyway?</source>
         <translation>Zgodovina</translation>
     </message>
     <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Entry history</source>
         <translation>Zgodovina vnosov</translation>
     </message>
@@ -786,21 +1720,8 @@ Do you want to open it anyway?</source>
         <translation>Nov atribut</translation>
     </message>
     <message>
-        <source>Select file</source>
-        <translation>Izberi datoteko</translation>
-    </message>
-    <message>
-        <source>Unable to open file</source>
-        <translation>Datoteke ni mogoče odpreti</translation>
-    </message>
-    <message>
-        <source>Save attachment</source>
-        <translation>Shrani priponko</translation>
-    </message>
-    <message>
-        <source>Unable to save the attachment:
-</source>
-        <translation>Priponke ni bilo mogoče shraniti:</translation>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tomorrow</source>
@@ -808,30 +1729,42 @@ Do you want to open it anyway?</source>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n teden</numerusform><numerusform>%n tedna</numerusform><numerusform>%n tedni</numerusform><numerusform>%n tednov</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation><numerusform>%n mesec</numerusform><numerusform>%n meseca</numerusform><numerusform>%n meseci</numerusform><numerusform>%n mesecev</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 leto</translation>
+        <source>Apply generated password?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Confirm Remove</source>
+        <source>Do you want to apply the generated password to this entry?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Are you sure you want to remove this attribute?</source>
+        <source>Entry updated successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <source>[PROTECTED] Press reveal to view or edit</source>
         <translation type="unfinished"/>
     </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
-        <source>Are you sure you want to remove this attachment?</source>
+        <source>Confirm Removal</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -850,27 +1783,27 @@ Do you want to open it anyway?</source>
         <translation>Odstrani</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Priponke</translation>
+        <source>Edit Name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save</source>
-        <translation>Shrani</translation>
+        <source>Protect</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open</source>
-        <translation>Odpri</translation>
+        <source>Reveal</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Edit Name</source>
-        <translation type="unfinished"/>
+        <source>Attachments</source>
+        <translation>Priponke</translation>
     </message>
     <message>
-        <source>Protect</source>
+        <source>Foreground Color:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Reveal</source>
+        <source>Background Color:</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -881,18 +1814,6 @@ Do you want to open it anyway?</source>
         <translation>Omogoči samodejno tipkanje za ta vnos</translation>
     </message>
     <message>
-        <source>+</source>
-        <translation>+</translation>
-    </message>
-    <message>
-        <source>-</source>
-        <translation>-</translation>
-    </message>
-    <message>
-        <source>Window title:</source>
-        <translation>Naslov okna:</translation>
-    </message>
-    <message>
         <source>Inherit default Auto-Type sequence from the &amp;group</source>
         <translation type="unfinished"/>
     </message>
@@ -901,15 +1822,23 @@ Do you want to open it anyway?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use default se&amp;quence</source>
+        <source>Window Associations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Set custo&amp;m sequence:</source>
-        <translation type="unfinished"/>
+        <source>+</source>
+        <translation>+</translation>
     </message>
     <message>
-        <source>Window Associations</source>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <source>Window title:</source>
+        <translation>Naslov okna:</translation>
+    </message>
+    <message>
+        <source>Use a specific sequence for this association:</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -935,12 +1864,8 @@ Do you want to open it anyway?</source>
 <context>
     <name>EditEntryWidgetMain</name>
     <message>
-        <source>Title:</source>
-        <translation>Naslov:</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Uporabniško ime:</translation>
+        <source>URL:</source>
+        <translation>URL:</translation>
     </message>
     <message>
         <source>Password:</source>
@@ -951,20 +1876,104 @@ Do you want to open it anyway?</source>
         <translation>Ponovi geslo:</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <source>Title:</source>
+        <translation>Naslov:</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Poteče</translation>
+        <source>Notes</source>
+        <translation>Opombe</translation>
     </message>
     <message>
         <source>Presets</source>
         <translation>Prednastavljeno</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation>Opombe:</translation>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>Uporabniško ime:</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Poteče</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1003,6 +2012,81 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Geslo:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1036,6 +2120,14 @@ Do you want to open it anyway?</source>
 <context>
     <name>EditWidgetIcons</name>
     <message>
+        <source>&amp;Use default icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Add custom icon</source>
         <translation>Dodaj poljubno ikono</translation>
     </message>
@@ -1044,6 +2136,14 @@ Do you want to open it anyway?</source>
         <translation>Izbriši ikono</translation>
     </message>
     <message>
+        <source>Download favicon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Images</source>
         <translation>Slike</translation>
     </message>
@@ -1052,44 +2152,44 @@ Do you want to open it anyway?</source>
         <translation>Vse datoteke</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Izberi sliko</translation>
-    </message>
-    <message>
-        <source>Download favicon</source>
+        <source>Custom icon already exists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to fetch favicon.</source>
+        <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t read icon</source>
+        <source>Custom icon successfully downloaded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Use default icon</source>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use custo&amp;m icon</source>
+        <source>Select Image(s)</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Confirm Delete</source>
-        <translation type="unfinished"/>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
+        <source>No icons were loaded</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation type="unfinished"/>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source>Custom icon already exists</source>
-        <translation type="unfinished"/>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1110,15 +2210,123 @@ Do you want to open it anyway?</source>
         <source>Uuid:</source>
         <translation>Uuid:</translation>
     </message>
+    <message>
+        <source>Plugin Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Odstrani</translation>
+    </message>
+    <message>
+        <source>Delete plugin data?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to delete the selected plugin data?
+This may cause the affected plugins to malfunction.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
+        <source>%1 - Clone</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Ime</translation>
+    </message>
+    <message>
+        <source>Size</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Dodaj</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Odstrani</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Odpri</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Shrani</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
+%1</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
     <name>EntryAttributesModel</name>
     <message>
         <source>Name</source>
@@ -1147,6 +2355,11 @@ Do you want to open it anyway?</source>
 <context>
     <name>EntryModel</name>
     <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Group</source>
         <translation>Skupina</translation>
     </message>
@@ -1163,8 +2376,166 @@ Do you want to open it anyway?</source>
         <translation>URL</translation>
     </message>
     <message>
-        <source>Ref: </source>
-        <comment>Reference abbreviation</comment>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Geslo</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Opombe</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Poteče</translation>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Accessed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Priponke</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Splošno</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Uporabniško ime</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Geslo</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Priponke</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Opombe</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Okno</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Sekvenca</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Išči</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryView</name>
+    <message>
+        <source>Customize View</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide Usernames</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide Passwords</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fit to window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fit to contents</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reset to defaults</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments (icon)</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1174,66 +2545,421 @@ Do you want to open it anyway?</source>
         <source>Recycle Bin</source>
         <translation>Koš</translation>
     </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
+    <name>GroupModel</name>
     <message>
-        <source>Length:</source>
-        <translation>Dolžina:</translation>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>HostInstaller</name>
     <message>
-        <source>Character Types</source>
-        <translation>Tipi znakov</translation>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Upper Case Letters</source>
-        <translation>Velike črke</translation>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KMessageWidget</name>
     <message>
-        <source>A-Z</source>
+        <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lower Case Letters</source>
-        <translation>Male črke</translation>
+        <source>Close message</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Kdbx3Reader</name>
     <message>
-        <source>a-z</source>
+        <source>Unable to calculate master key</source>
+        <translation>Izračun glavnega ključa ni uspel</translation>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Numbers</source>
-        <translation>Številke</translation>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>Napačno geslo ali pa je podatkovna baza poškodovana.</translation>
     </message>
     <message>
-        <source>0-9</source>
+        <source>missing database headers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Special Characters</source>
-        <translation>Posebni znaki</translation>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>/*_&amp; ...</source>
+        <source>Invalid header id size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Izključi podobne znake</translation>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>Geslo naj vsebuje znake iz vsake skupine</translation>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>KMessageWidget</name>
+    <name>Kdbx3Writer</name>
     <message>
-        <source>&amp;Close</source>
+        <source>Unable to issue challenge-response.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Close message</source>
+        <source>Unable to calculate master key</source>
+        <translation>Izračun glavnega ključa ni uspel</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Izračun glavnega ključa ni uspel</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Izračun glavnega ključa ni uspel</translation>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>Datoteka ni KeePass podatkovna baza.</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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1267,6 +2993,35 @@ Do you want to open it anyway?</source>
         <translation>Različica KeePass podatkovne baze ni podprta.</translation>
     </message>
     <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Root</source>
         <translation>Koren</translation>
     </message>
@@ -1278,82 +3033,295 @@ Do you want to open it anyway?</source>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Napačno geslo ali pa je podatkovna baza poškodovana.</translation>
     </message>
-</context>
-<context>
-    <name>KeePass2Reader</name>
     <message>
-        <source>Not a KeePass database.</source>
-        <translation>Datoteka ni KeePass podatkovna baza.</translation>
+        <source>Key transformation failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
-        <translation>Različica KeePass podatkovne baze ni podprta.</translation>
+        <source>Invalid group field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
-        <translation>Napačno geslo ali pa je podatkovna baza poškodovana.</translation>
+        <source>Invalid group field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Izračun glavnega ključa ni uspel</translation>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to issue challenge-response.</source>
+        <source>Incorrect group id field size</source>
         <translation type="unfinished"/>
     </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>
+        <source>Incorrect group creation time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group modification time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group expiry time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group level field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group field type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing group id or level</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing entry field type number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry modification time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry field type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unable to seek to content position</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>KeePass2Writer</name>
+    <name>KeeShare</name>
     <message>
-        <source>Unable to issue challenge-response.</source>
+        <source>Disabled share</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Izračun glavnega ključa ni uspel</translation>
+        <source>Import from</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Napaka pri testiranju kriptografskih funkcij.</translation>
+        <source>Key Component</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
+        <source>Key Component Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
+        <source>Key Component set, click to change or remove</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>Prebrskaj</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Datoteke s ključi</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Vse datoteke</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Ustvari datoteko s ključi...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Izberi datoteko s kljući</translation>
+    </message>
+</context>
+<context>
     <name>MainWindow</name>
     <message>
-        <source>Open database</source>
-        <translation>Odpri podatkovno bazo</translation>
+        <source>&amp;Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Recent databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>E&amp;ntries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Tools</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;About</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Open database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Save database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Close database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Delete entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Edit group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Delete group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sa&amp;ve database as...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database settings</source>
         <translation>Nastavitve podatkovne baze</translation>
     </message>
     <message>
+        <source>&amp;Clone entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Copy username to clipboard</source>
         <translation>Kopiraj uporabniško ime v odložišče</translation>
     </message>
@@ -1362,362 +3330,503 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Kopiraj geslo v odložišče</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Nastavitve</translation>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password Generator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Lock databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy title to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy URL to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy notes to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Export to CSV file...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show toolbar</source>
-        <translation>Prikaži orodno vrstico</translation>
+        <source>Set up TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;TOTP</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>read-only</source>
-        <translation>samo za branje</translation>
+        <source>E&amp;mpty recycle bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Nastavitve</translation>
     </message>
     <message>
         <source>Toggle window</source>
         <translation>Preklopi okno</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 podatkovna baza</translation>
+        <source>Quit KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Vse datoteke</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save repaired database</source>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Zapis podatkovne baze ni uspel.</translation>
+        <source>&amp;Donate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Recent databases</source>
+        <source>Report a &amp;bug</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>E&amp;ntries</source>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
+        <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Groups</source>
+        <source>Copy att&amp;ribute...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;View</source>
+        <source>TOTP...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Quit</source>
+        <source>&amp;New database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;About</source>
+        <source>Create a new database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Save database</source>
+        <source>&amp;Merge from database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Close database</source>
+        <source>Merge from another KDBX database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;New database</source>
+        <source>&amp;New entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge from KeePassX database</source>
+        <source>Add a new entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Add new entry</source>
+        <source>&amp;Edit entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;View/Edit entry</source>
+        <source>View or edit entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Delete entry</source>
+        <source>&amp;New group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Add new group</source>
+        <source>Add a new group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Edit group</source>
+        <source>Change master &amp;key...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Delete group</source>
+        <source>&amp;Database settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Database settings</source>
+        <source>Copy &amp;password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Clone entry</source>
+        <source>Perform &amp;Auto-Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Timed one-time password</source>
+        <source>Open &amp;URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
+        <source>KeePass 1 database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show TOTP</source>
+        <source>Import a KeePass 1 database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Find</source>
+        <source>CSV file...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy &amp;username</source>
+        <source>Import a CSV file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
+        <source>Show TOTP...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Settings</source>
+        <source>Show TOTP QR Code...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
+        <source>Check for Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Open URL</source>
+        <source>Share entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Lock databases</source>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Title</source>
+        <source>Check for updates on startup?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;URL</source>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Notes</source>
+        <source>You can always check for updates manually from the application menu.</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Merger</name>
     <message>
-        <source>Password Generator</source>
+        <source>Creating missing %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear history</source>
+        <source>Relocating %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Database</source>
+        <source>Overwriting %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import</source>
+        <source>older entry merged from database &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Tools</source>
+        <source>Adding backup for older target %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty recycle bin</source>
+        <source>Adding backup for older source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Quit KeePassXC</source>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
+        <source>Synchronizing from newer source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Help</source>
+        <source>Synchronizing from older source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Open database...</source>
+        <source>Deleting child %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sa&amp;ve database as...</source>
+        <source>Deleting orphan %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
+        <source>Changed deleted objects</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Export to CSV file...</source>
+        <source>Adding missing icon %1</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Koren</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
     <message>
-        <source>Import KeePass 1 database...</source>
+        <source>WizardPage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import CSV file...</source>
+        <source>En&amp;cryption Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;pair database...</source>
+        <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"/>
     </message>
     <message>
-        <source>Set up TOTP...</source>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple Settings</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>NewDatabaseWizardPageEncryption</name>
     <message>
-        <source>Dialog</source>
+        <source>Encryption Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Splošno</translation>
+        <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"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <source>Database Master Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
+        <source>A master key known only to you protects your database.</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <source>General Database Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Napredno</translation>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Always allow &amp;access to entries</source>
+        <source>Invalid key file, expecting an OpenSSH key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
+        <source>PEM boundary mismatch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <source>Base64 decoding failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
+        <source>Key file way too small.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
+        <source>Key file magic header id invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <source>Found zero keys</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
+        <source>Failed to read public key.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <source>Corrupted key file, reading private key failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
+        <source>No private key payload to decrypt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
+        <source>Trying to run KDF without cipher</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
+        <source>Passphrase is required to decrypt this key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <source>Key derivation failed, key file corrupted?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
+        <source>Decryption failed, wrong passphrase?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
+        <source>Unexpected EOF while reading public key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enable KeePassHTTP server</source>
+        <source>Unexpected EOF while reading private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <source>Can&apos;t write public key as it is empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return only best matching entries</source>
+        <source>Unexpected EOF when writing public key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
+        <source>Can&apos;t write private key as it is empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Match URL schemes</source>
+        <source>Unexpected EOF when writing private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password Generator</source>
+        <source>Unsupported key type: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only the selected database has to be connected with a client.</source>
+        <source>Unknown cipher: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cipher IV is too short for MD5 kdf</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown KDF: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown key type: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PasswordEditWidget</name>
+    <message>
+        <source>Enter password:</source>
+        <translation>Vnesi geslo:</translation>
+    </message>
+    <message>
+        <source>Confirm password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Geslo</translation>
+    </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"/>
     </message>
     <message>
-        <source>The following options can be dangerous!
-Change them only if you know what you are doing.</source>
+        <source>Password cannot be empty.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passwords do not match.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate master password</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
     <message>
+        <source>%p%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Password:</source>
         <translation>Geslo:</translation>
     </message>
     <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Geslo</translation>
+    </message>
+    <message>
         <source>Character Types</source>
         <translation>Tipi znakov</translation>
     </message>
@@ -1738,43 +3847,43 @@ Change them only if you know what you are doing.</source>
         <translation>Posebni znaki</translation>
     </message>
     <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Izključi podobne znake</translation>
+        <source>Extended ASCII</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Accept</source>
-        <translation>Sprejmi</translation>
+        <source>Exclude look-alike characters</source>
+        <translation>Izključi podobne znake</translation>
     </message>
     <message>
-        <source>%p%</source>
+        <source>Pick characters from every group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>strength</source>
+        <source>&amp;Length:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>entropy</source>
+        <source>Passphrase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Length:</source>
+        <source>Wordlist:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Pick characters from every group</source>
+        <source>Word Separator:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Generate</source>
+        <source>Copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="unfinished"/>
+        <source>Accept</source>
+        <translation>Sprejmi</translation>
     </message>
     <message>
-        <source>Apply</source>
+        <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1787,74 +3896,429 @@ Change them only if you know what you are doing.</source>
     </message>
     <message>
         <source>Poor</source>
+        <comment>Password quality</comment>
         <translation type="unfinished"/>
     </message>
     <message>
         <source>Weak</source>
+        <comment>Password quality</comment>
         <translation type="unfinished"/>
     </message>
     <message>
         <source>Good</source>
+        <comment>Password quality</comment>
         <translation type="unfinished"/>
     </message>
     <message>
         <source>Excellent</source>
+        <comment>Password quality</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Geslo</translation>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extended ASCII</source>
+        <source>Switch to advanced mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase</source>
+        <source>Advanced</source>
+        <translation>Napredno</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist:</source>
+        <source>A-Z</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Count:</source>
+        <source>Lower Case Letters A to F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Separator:</source>
+        <source>a-z</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
+        <source>0-9</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Izbriši</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Odstrani</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Onemogoči</translation>
+    </message>
+    <message>
+        <source>Merge</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>NULL device</source>
+        <source>Database not opened</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>error reading from device</source>
+        <source>Database hash not available</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Client public key not received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot decrypt message</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>file empty !
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>malformed string</source>
+        <source>Name of the command to execute.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>missing closing quote</source>
+        <source>List database entries.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
     </message>
     <message>
-        <source>INTERNAL - unget lower bound exceeded</source>
+        <source>attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>NULL device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>error reading from device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>malformed string</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>missing closing quote</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1874,14 +4338,18 @@ Change them only if you know what you are doing.</source>
         <translation>Geslo</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
-    </message>
-    <message>
         <source>Notes</source>
         <translation>Opombe</translation>
     </message>
     <message>
+        <source>Last Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Browser Integration</source>
         <translation type="unfinished"/>
     </message>
@@ -1897,6 +4365,461 @@ Change them only if you know what you are doing.</source>
         <source>Passive</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new random diceware passphrase.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word count for the diceware passphrase.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wordlist for the diceware generator.
+[Default: EFF English]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new random password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>pot do konfiguracijske datoteke po meri</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>datoteka s ključi podatkovne baze</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Napaka pri testiranju kriptografskih funkcij.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -1933,309 +4856,373 @@ Change them only if you know what you are doing.</source>
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
     <message>
-        <source>Case Sensitive</source>
+        <source>Agent connection failed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Išči</translation>
+        <source>Agent protocol error.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear</source>
+        <source>No agent running, cannot add identity.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Search...</source>
+        <source>No agent running, cannot remove identity.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Limit search to selected group</source>
+        <source>Agent refused this identity. Possible reasons include:</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Service</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
+        <source>The key has already been added.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
+        <source>A confirmation request is not supported by the agent (check options).</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
     <message>
-        <source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source>
+        <source>Search Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <source>Every search term must match (ie, logical AND)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
+        <source>Modifiers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
+        <source>exclude term from results</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Successfully removed permissions from %1 %2.</source>
+        <source>match term exactly</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
+        <source>use regex in term</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: New key association request</source>
+        <source>Fields</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
+        <source>Term Wildcards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
+        <source>match anything</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
+        <source>match one</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
+        <source>logical OR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
+        <source>Examples</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
+        <source>Search</source>
+        <translation>Išči</translation>
+    </message>
     <message>
-        <source>KeePassXC: No keys found</source>
+        <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
+        <source>Limit search to selected group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
+        <source>Search Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation>Razlikuj med velikimi in malimi črkami</translation>
+    </message>
 </context>
 <context>
-    <name>SettingsWidget</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>Application Settings</source>
-        <translation>Nastavitve aplikacije</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Splošno</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>Varnost</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
+        <source>Own certificate</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Remember last databases</source>
-        <translation>Zapomni si zadnje podatkovne baze</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>Samodejno shrani ob izhodu</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>Samodejno shrani po vsaki spremembi</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>Minimiziraj pri kopiranju v odložišče</translation>
+        <source>Key:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>Za nove vnose uporabi ikono skupine</translation>
+        <source>Generate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Globalna bližnjica za samodejno tipkanje</translation>
+        <source>Import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Jezik</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>Pokaži ikono v sistemski vrstici</translation>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>Minimiziraj v sistemsko vrstico</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
+        <source>Ask</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically reload the database when modified externally</source>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Odstrani</translation>
+    </message>
+    <message>
+        <source>Path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
+        <source>Status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
+        <source>Fingerprint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Basic Settings</source>
+        <source>Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
+        <source>Trusted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <source>Untrusted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Samodejno tipkanje</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title and URL to match windows for global Auto-Type</source>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
+        <source>KeeShare key file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
+        <source>All files</source>
+        <translation>Vse datoteke</translation>
+    </message>
+    <message>
+        <source>Select path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
+        <source>Exporting changed certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
+        <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"/>
+    </message>
+    <message>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SettingsWidgetSecurity</name>
+    <name>ShareObserver</name>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>Pobriši odložišče po</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <translation>sekundah</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>Zakleni podatkovne baze po neaktivnosti </translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Gesla privzeto v čistopisu</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
+        <source>Not this time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
+        <source>Never</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Timeouts</source>
+        <source>Always</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
+        <source>Just this time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
+        <source>Import from %1 failed (%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Privacy</source>
+        <source>Import from %1 successful (%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
+        <source>Imported from %1</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SetupTotpDialog</name>
     <message>
-        <source>Setup TOTP</source>
+        <source>Signed share container are not supported - import prevented</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key:</source>
+        <source>File is not readable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use custom settings</source>
+        <source>Invalid sharing container</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
+        <source>Untrusted import prevented</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Time step:</source>
+        <source>Successful signed import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>8 digits</source>
+        <source>Unexpected error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>6 digits</source>
+        <source>Unsigned share container are not supported - import prevented</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Code size:</source>
+        <source>Successful unsigned import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <translation>sekundah</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2252,137 +5239,185 @@ give it a unique name to identify and accept it.</source>
         <source>Copy</source>
         <translation type="unfinished"/>
     </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>
+    </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <source>Expires in</source>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
+        <source>There was an error creating the QR code.</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>Odkleni podatkovno bazo</translation>
+        <source>Closing in %1 seconds.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>WelcomeWidget</name>
+    <name>TotpSetupDialog</name>
+    <message>
+        <source>Setup TOTP</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <source>Welcome to KeePassXC</source>
+        <source>Key:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start storing your passwords securely in a KeePassXC database</source>
+        <source>Default RFC 6238 token settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Create new database</source>
+        <source>Steam token settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open existing database</source>
+        <source>Use custom settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import from KeePass 1</source>
+        <source>Custom Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import from CSV</source>
+        <source>Time step:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Recent databases</source>
-        <translation>Nedavne podatkovne baze</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>sekundah</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>6 digits</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>7 digits</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>8 digits</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>main</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>path to a custom config file</source>
-        <translation>pot do konfiguracijske datoteke po meri</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>datoteka s ključi podatkovne baze</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - cross-platform password manager</source>
+        <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
+        <source>Update Error!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
+        <source>An error occurred in retrieving update information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy a password to the clipboard</source>
+        <source>Please try again later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Path of the database.</source>
+        <source>Software Update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use a GUI prompt unlocking the database.</source>
+        <source>A new version of KeePassXC is available!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Name of the entry to clip.</source>
+        <source>KeePassXC %1 is now available — you have %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extract and print the content of a database.</source>
+        <source>Download it at keepassxc.org</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Path of the database to extract.</source>
+        <source>You&apos;re up-to-date!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Name of the command to execute.</source>
+        <source>KeePassXC %1 is currently the newest version available</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>WelcomeWidget</name>
     <message>
-        <source>List database entries.</source>
+        <source>Start storing your passwords securely in a KeePassXC database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Path of the group to list. Default is /</source>
+        <source>Create new database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Print the UUIDs of the entries and groups.</source>
+        <source>Open existing database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge two databases.</source>
+        <source>Import from KeePass 1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Path of the database to merge into.</source>
+        <source>Import from CSV</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Path of the database to merge from.</source>
+        <source>Recent databases</source>
+        <translation>Nedavne podatkovne baze</translation>
+    </message>
+    <message>
+        <source>Welcome to KeePassXC %1</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>Use the same password for both database files.</source>
+        <source>Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show a password.</source>
+        <source>YubiKey Challenge-Response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Name of the entry to show.</source>
+        <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"/>
+    </message>
+    <message>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No YubiKey inserted.</source>
         <translation type="unfinished"/>
     </message>
 </context>
diff --git a/share/translations/keepassx_sr.ts b/share/translations/keepassx_sr.ts
index cba368b8d..80787e01e 100644
--- a/share/translations/keepassx_sr.ts
+++ b/share/translations/keepassx_sr.ts
@@ -38,11 +38,6 @@
         <translation>Копирај</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>Верзија %1</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>Ревизија %1</translation>
     </message>
@@ -75,34 +70,48 @@ Kernel: %3 %4</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
+        <source>Version %1</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP Потврдите Приступ</translation>
+        <source>Build Type: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>Запамти ову одлуку</translation>
+        <source>Auto-Type</source>
+        <translation>Аутоматско-куцање</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Допусти</translation>
+        <source>Browser Integration</source>
+        <translation>Интеграција са прегледачем</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>Одбаци</translation>
+        <source>SSH Agent</source>
+        <translation>SSH Агент</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>%1 тражи приступ лозинкама за следеће ставке.
-Молим вас одаберите да ли желите да одобрите приступ.</translation>
+        <source>YubiKey</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -111,6 +120,277 @@ Please select whether you want to allow access.</source>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>Омогући SSH агента (захтева поновно покретање апликације)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Опште</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Грешка приликом приступа конфигурационој датотеци %1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Опште</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Аутоматско-куцање</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -214,6 +494,26 @@ Please select whether you want to allow access.</source>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -287,14 +587,6 @@ Please select whether you want to allow access.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>Напредно</translation>
     </message>
@@ -360,19 +652,36 @@ Please select whether you want to allow access.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <source>Select custom proxy location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Executable Files (*)</source>
+        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Select custom proxy location</source>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
+        <source>&amp;Tor Browser</source>
+        <translation type="unfinished"/>
+    </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: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not ask permission for HTTP &amp;Basic Auth</source>
+        <extracomment>An extra HTTP Basic Auth setting</extracomment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -411,152 +720,46 @@ Do you want to overwrite it?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
+        <source>Abort</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
+        <source>Converting attributes to custom data…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <source>Successfully moved %n keys to custom data.</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Removing stored permissions…</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Abort</source>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
         <translation type="unfinished"/>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
-    </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>Лозинка</translation>
-    </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>Унесите лозинку:</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>Поновите лозинку:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;Кључ-Датотека</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>Разгледај</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Креирај</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>Изазов Одговор</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Освежи</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>Датотеке са кључем</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>Све датотеке</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>Креирај датотеку са кључем...</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>Није могуће креирати Датотеку са Кључем:</translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>Одаберите датотеку са кључем</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Празна лозинка</translation>
-    </message>
-    <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>Да ли сте сигурни да желите да лозинка буде празна?</translation>
-    </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>Унете су две различите лозинке.</translation>
-    </message>
-    <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>Неуспешно постављање %1 као Датотеке са Кључем:
-%2</translation>
-    </message>
-    <message>
-        <source>Legacy key file format</source>
-        <translation type="unfinished"/>
-    </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 type="unfinished"/>
-    </message>
-    <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>Неуспешна промена главног кључа: YubiKey није унет.</translation>
-    </message>
-</context>
-<context>
     <name>CloneDialog</name>
     <message>
         <source>Clone Options</source>
@@ -634,14 +837,6 @@ Please consider generating a new key file.</source>
         <translation>Није присутан у CSV датотеци</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>Празно име поља</translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>колона</translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>Увезено из CSV датотеке</translation>
     </message>
@@ -650,51 +845,87 @@ Please consider generating a new key file.</source>
         <translation>Изворни подаци:</translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>Грешка(грешке) у CSV датотеци !</translation>
+        <source>Error</source>
+        <translation>Грешка</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation>порука прескочено]</translation>
+        <source>Empty fieldname %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Грешка</translation>
+        <source>column %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>CSV увоз: грешке приликом уписа:
-</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>Грешка</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Није могуће израчунати главни кључ</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
+        <source>%n column(s)</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
+        <source>%n byte(s)</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
+        <source>%n row(s)</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Корен</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DatabaseOpenWidget</name>
     <message>
         <source>Enter master key</source>
@@ -721,14 +952,6 @@ Please consider generating a new key file.</source>
         <translation>Изазов Одговор:</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Није могуће отворити базу података.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Није могуће отворити кључ-датотеку</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation type="unfinished"/>
     </message>
@@ -755,102 +978,169 @@ Please consider generating a new key file.</source>
         <source>Select key file</source>
         <translation>Одаберите кључ-датотеку</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>Оправи базу података</translation>
+        <source>TouchID for quick unlock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Грешка</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Није могуће отворити кључ-датотеку</translation>
+        <source>Can't open key file:
+%1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Није могуће отворити базу података.</translation>
+        <source>Passwords</source>
+        <translation>Лозинке</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
+    <message>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Опште</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>База података успешно отворена. Нема шта да се уради.</translation>
+        <source>Security</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Success</source>
-        <translation>Успешно</translation>
+        <source>Master Key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>База података је успешно оправљена
-Сада је можете сачувати.</translation>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>Није могуће оправити базу података.</translation>
+        <source>Browser Integration</source>
+        <translation>Интеграција са прегледачем</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>Опште</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Encryption</source>
+        <source>&amp;Disconnect all browsers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
+        <source>Forg&amp;et all site-specific settings on entries</source>
         <translation type="unfinished"/>
     </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>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Understood, keep number</source>
+        <source>Stored keys</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cancel</source>
+        <source>Remove</source>
+        <translation>Уклони</translation>
+    </message>
+    <message>
+        <source>Delete the selected key?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
         <translation type="unfinished"/>
     </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>
+        <source>Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KDF unchanged</source>
+        <source>Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
+        <source>Successfully removed permissions from %n entry(s).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetEncryption</name>
@@ -886,6 +1176,109 @@ If you keep this number, your database may be too easy to crack!</source>
         <source>Parallelism:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -935,91 +1328,110 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>Корен</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 База података</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Све датотеке</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Отвори базу података</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>Датотека није пронађена!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Није могуће отворити базу података.</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>Датотека је отворена у моду само за читање.</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>Отвори CSV датотеку</translation>
+        <source>Add additional protection...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>CSV датотека</translation>
+        <source>No encryption key added</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>Све датотеке (*)</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Удружи базу података</translation>
+        <source>No password set</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Отвори KeePass 1  базу података</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 type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1 база података</translation>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>Затвори?</translation>
+        <source>Failed to change master key</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; у моду за измене.
-Одбаци све измене и свеједно затвори?</translation>
+        <source>Database Name:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>Сними измене?</translation>
+        <source>Description:</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>&quot;%1&quot; је измењен.
-Сачувај измене?</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 База података</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Уписивање у базу података није успело.</translation>
+        <source>All files</source>
+        <translation>Све датотеке</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Лозинке</translation>
+        <source>Open database</source>
+        <translation>Отвори базу података</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Сними базу података као</translation>
+        <source>CSV file</source>
+        <translation>CSV датотека</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>Удружи базу података</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Отвори KeePass 1  базу података</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 база података</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1030,38 +1442,39 @@ Save changes?</source>
         <translation>Уписивање у CSV датотеку није успело.</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>Нова база података</translation>
+        <source>Database creation error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>locked</source>
-        <translation>закључано</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 type="unfinished"/>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>Закључај базу података</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>Није могуће закључати базу података јер је тренутно ажурирате.
-Молим вас сачувајте измене или их одбаците.</translation>
+        <source>Select CSV file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>Ова база података је измењена.
-Да ли желите да је сачувате пре закључавања?
-У супротном све измене ће бити изгубљене.</translation>
+        <source>New Database</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disable safe saves?</source>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
         <translation type="unfinished"/>
     </message>
     <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>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1072,37 +1485,13 @@ Disable safe saves and try again?</source>
         <translation>Претрага је у току...</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>Промени главни кључ</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>Обриши ставку?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>Да ли сте сигурни да желите да обришете ставку &quot;%1&quot;?</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Обриши ставке?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Да ли сте сигурни да желите да обришете %1 ставке?</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Премести ставку у корпу за отпатке?</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation>Да ли сте сигурни да желите да преместите ставку &quot;%1&quot; у корпу за отпатке?</translation>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Премести ставке у корпу за отпатке?</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -1120,18 +1509,10 @@ Disable safe saves and try again?</source>
         <translation>Запамти мој избор</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Обриши групу?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>Да ли сте сигурни да желите да обришете групу &quot;%1&quot;?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Није могуће израчунати главни кључ</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>Нема тренутне базе података.</translation>
     </message>
@@ -1165,10 +1546,6 @@ Do you want to merge your changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>Није могуће отворити нову датотеку базе података током аутоматског учитавања тренутне базе.</translation>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>Испразни корпу за отпатке</translation>
     </message>
@@ -1176,88 +1553,103 @@ Do you want to merge your changes?</source>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>Да ли сте сигурни да желите да желите да трајно обришете све ставке из корпе за отпатке?</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>Генериши TOTP токен</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Затвори</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Датотека је отворена у моду само за читање.</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Опште</translation>
+        <source>Lock Database?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Лозинка</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot; је измењен.
+Сачувај измене?</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>Датум истека</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Корисничко име</translation>
+        <source>Save changes?</source>
+        <translation>Сними измене?</translation>
     </message>
     <message>
-        <source>Autotype</source>
-        <translation>Аутоматско куцање</translation>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>Претрага је у току...</translation>
+        <source>Disable safe saves?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>Атрибути</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Прилози</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Белешке</translation>
+        <source>Passwords</source>
+        <translation>Лозинке</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>Прозор</translation>
+        <source>Save database as</source>
+        <translation>Сними базу података као</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>Секвенца</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 База података</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Претрага</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Очисти</translation>
+        <source>Delete group</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Never</source>
-        <translation>Никада</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[ЗАШТИЋЕНО]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>Онемогућено</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Омогућено</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1331,22 +1723,10 @@ Do you want to merge your changes?</source>
         <translation>Нови атрибут</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Потврди уклањање</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>Да ли сте сигурни да желите да уклоните атрибут?</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[ЗАШТИЋЕНО]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation>Молимо вас да откријете да бисте видели или изменили </translation>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>Сутра</translation>
     </message>
@@ -1359,10 +1739,6 @@ Do you want to merge your changes?</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 година</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation type="unfinished"/>
     </message>
@@ -1374,6 +1750,26 @@ Do you want to merge your changes?</source>
         <source>Entry updated successfully.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1619,6 +2015,81 @@ Do you want to merge your changes?</source>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Лозинка:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1676,10 +2147,6 @@ Do you want to merge your changes?</source>
         <translation>Неуспело добављање иконе са сајта.</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Савет: Можете омогућити Гугл као резерву под Алатке&gt;Подешавања&gt;Сигурност</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>Слике</translation>
     </message>
@@ -1688,14 +2155,6 @@ Do you want to merge your changes?</source>
         <translation>Све датотеке</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Одабери слику</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read icon</source>
-        <translation>Није могуће учитати иконицу</translation>
-    </message>
-    <message>
         <source>Custom icon already exists</source>
         <translation>Посебна иконица већ постоји</translation>
     </message>
@@ -1704,8 +2163,36 @@ Do you want to merge your changes?</source>
         <translation>Потврди брисање</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>Ову иконицу користи %1 уноса, и биће замењена подразумеваном иконицом. Да ли сте сигурни да желите да је обришете?</translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1755,9 +2242,8 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation>- Дупликат</translation>
+        <source>%1 - Clone</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1802,10 +2288,6 @@ This may cause the affected plugins to malfunction.</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Потврди уклањање</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>Сними прилоге</translation>
     </message>
@@ -1838,10 +2320,13 @@ This may cause the affected plugins to malfunction.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>Није могуће отворити датотеке:
-%1</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1925,109 +2410,167 @@ This may cause the affected plugins to malfunction.</source>
         <source>Attachments</source>
         <translation>Прилози</translation>
     </message>
-</context>
-<context>
-    <name>EntryView</name>
     <message>
-        <source>Customize View</source>
+        <source>Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide Usernames</source>
+        <source>TOTP</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
     <message>
-        <source>Hide Passwords</source>
-        <translation type="unfinished"/>
+        <source>Generate TOTP Token</source>
+        <translation>Генериши TOTP токен</translation>
     </message>
     <message>
-        <source>Fit to window</source>
-        <translation type="unfinished"/>
+        <source>Close</source>
+        <translation>Затвори</translation>
     </message>
     <message>
-        <source>Fit to contents</source>
-        <translation type="unfinished"/>
+        <source>General</source>
+        <translation>Опште</translation>
     </message>
     <message>
-        <source>Reset to defaults</source>
-        <translation type="unfinished"/>
+        <source>Username</source>
+        <translation>Корисничко име</translation>
     </message>
     <message>
-        <source>Attachments (icon)</source>
-        <translation type="unfinished"/>
+        <source>Password</source>
+        <translation>Лозинка</translation>
     </message>
-</context>
-<context>
-    <name>Group</name>
     <message>
-        <source>Recycle Bin</source>
-        <translation>Корпа за отпатке</translation>
+        <source>Expiration</source>
+        <translation>Датум истека</translation>
     </message>
-</context>
-<context>
-    <name>HostInstaller</name>
     <message>
-        <source>KeePassXC: Cannot save file!</source>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>Атрибути</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Прилози</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Белешке</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Аутоматско куцање</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Прозор</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Редослед</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Претрага је у току...</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Претрага</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Очисти</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Никада</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[ЗАШТИЋЕНО]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot save the native messaging script file.</source>
+        <source>Enabled</source>
+        <translation>Омогућено</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Онемогућено</translation>
+    </message>
+    <message>
+        <source>Share</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>Дужина:</translation>
-    </message>
+    <name>EntryView</name>
     <message>
-        <source>Character Types</source>
-        <translation>Типови карактера</translation>
+        <source>Customize View</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Upper Case Letters</source>
-        <translation>Велика слова</translation>
+        <source>Hide Usernames</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
+        <source>Hide Passwords</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lower Case Letters</source>
-        <translation>Мала слова</translation>
+        <source>Fit to window</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
+        <source>Fit to contents</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Numbers</source>
-        <translation>Бројеви</translation>
+        <source>Reset to defaults</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
+        <source>Attachments (icon)</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Group</name>
     <message>
-        <source>Special Characters</source>
-        <translation>Посебни карактери</translation>
+        <source>Recycle Bin</source>
+        <translation>Корпа за отпатке</translation>
     </message>
     <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>GroupModel</name>
     <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Изостави сличне карактере</translation>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>HostInstaller</name>
     <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>Обезбеди да лозинка садржи карактере из сваке групе</translation>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extended ASCII</source>
-        <translation>Проширени ASCII</translation>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2055,6 +2598,26 @@ This may cause the affected plugins to malfunction.</source>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Неисправан кључ или неисправна база података.</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2214,10 +2777,6 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation type="unfinished"/>
     </message>
@@ -2268,6 +2827,18 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Unsupported KeePass 2 database version.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2340,10 +2911,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation type="unfinished"/>
     </message>
@@ -2392,6 +2959,12 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2555,28 +3128,126 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Invalid entry field type</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <source>Disabled share</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <source>Import from</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Друга инстанца KeePassXC апликације је већ активна.</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
+        <source>Synchronize with</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Грешка</translation>
+        <source>Key Component</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>Преглед</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Генериши</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Кључ-Датотеке</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Све датотеке</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Креирај Кључ-Датотеку...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Одаберите кључ-датотеку</translation>
     </message>
 </context>
 <context>
@@ -2590,10 +3261,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Скорашње базе података</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Увези</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation>Помоћ</translation>
     </message>
@@ -2602,14 +3269,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Уноси</translation>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>Копирај атрибут</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>&amp;Groups</source>
         <translation>Групе</translation>
     </message>
@@ -2638,30 +3297,10 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Затвори базу података</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>Нова база података</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>Удружи податке из KeePassX базе података</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>Додај нови унос</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>Прикажи/Измени унос</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>Обриши унос</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>Додај нову групу</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>Измени групу</translation>
     </message>
@@ -2674,14 +3313,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Сачувај базу података као...</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Промени главни кључ</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>Подешавања базе података</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>Подешавања базе података</translation>
     </message>
@@ -2690,10 +3321,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Направи дупликат уноса</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>Пронађи</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>Копирај корисничко име</translation>
     </message>
@@ -2702,10 +3329,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Копирај корисничко име</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>Копирај лозинку</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>Копирај лозинку</translation>
     </message>
@@ -2718,14 +3341,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Генератор Лозинки</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation>Изврши Аутоматско-куцање</translation>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>Отвори URL</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>Закључај базу података</translation>
     </message>
@@ -2758,22 +3373,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Извези у CSV датотеку</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Увези KeePass 1 базу података</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>Увези CSV датотеку...</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Оправи базу података...</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>Прикажи TOTP</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>Подеси TOTP...</translation>
     </message>
@@ -2794,14 +3393,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Грешка приликом приступа конфигурационој датотеци %1</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>само-читање</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Подешавања</translation>
     </message>
@@ -2814,253 +3405,404 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Напусти KeePassXC</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 База података</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Све датотеке</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Отвори базу података</translation>
+        <source>&amp;Donate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Сними исправљену базу података</translation>
+        <source>Report a &amp;bug</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Уписивање у базу података није успело.</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
+        <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
+        <source>Copy att&amp;ribute...</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>OpenSSHKey</name>
     <message>
-        <source>Invalid key file, expecting an OpenSSH key</source>
-        <translation>Неисправна датотека са кључем, очекује се OpenSSH кључ</translation>
+        <source>TOTP...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>PEM boundary mismatch</source>
+        <source>&amp;New database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Base64 decoding failed</source>
-        <translation>Декодирање Base64 није успело</translation>
+        <source>Create a new database</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key file way too small.</source>
-        <translation>Кључ-датотека је превише мала.</translation>
+        <source>&amp;Merge from database...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key file magic header id invalid</source>
-        <translation>Идентификатор магичног заглавља Кључ-датотеке није валидан </translation>
+        <source>Merge from another KDBX database</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Found zero keys</source>
-        <translation>Није пронађен ниједан кључ</translation>
+        <source>&amp;New entry</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to read public key.</source>
-        <translation>Није могуће прочитати јавни кључ.</translation>
+        <source>Add a new entry</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Corrupted key file, reading private key failed</source>
-        <translation>Кључ-датотека је корумпирана, није успело ишчитавање приватног кључа</translation>
+        <source>&amp;Edit entry</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>No private key payload to decrypt</source>
-        <translation>Нема приватног кључа за декриптовање</translation>
+        <source>View or edit entry</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Trying to run KDF without cipher</source>
+        <source>&amp;New group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase is required to decrypt this key</source>
+        <source>Add a new group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key derivation failed, key file corrupted?</source>
+        <source>Change master &amp;key...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Decryption failed, wrong passphrase?</source>
+        <source>&amp;Database settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unexpected EOF while reading public key</source>
+        <source>Copy &amp;password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unexpected EOF while reading private key</source>
+        <source>Perform &amp;Auto-Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t write public key as it is empty</source>
-        <translation>Није могуће записати јавни кључ јер је празан</translation>
+        <source>Open &amp;URL</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unexpected EOF when writing public key</source>
-        <translation>Неочекиван крај датотеке приликом уписивања јавног кључа</translation>
+        <source>KeePass 1 database...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t write private key as it is empty</source>
-        <translation>Није могуће записати приватни кључ јер је празан</translation>
+        <source>Import a KeePass 1 database</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unexpected EOF when writing private key</source>
-        <translation>Неочекиван крај датотеке приликом уписивања приватног кључа</translation>
+        <source>CSV file...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported key type: %1</source>
+        <source>Import a CSV file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unknown cipher: %1</source>
+        <source>Show TOTP...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cipher IV is too short for MD5 kdf</source>
+        <source>Show TOTP QR Code...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unknown KDF: %1</source>
+        <source>Check for Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unknown key type: %1</source>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>Merger</name>
     <message>
-        <source>Dialog</source>
-        <translation>Дијалог</translation>
+        <source>Creating missing %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
+        <source>Relocating %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>Омогући KeePassHTTP сервер</translation>
+        <source>Overwriting %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Опште</translation>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <source>Adding backup for older target %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <source>Adding backup for older source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return only best matching entries</source>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
+        <source>Synchronizing from newer source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Match URL schemes</source>
+        <source>Synchronizing from older source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Сортирај пронађене уносе по корисничком имену</translation>
+        <source>Deleting child %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Сортирај пронађене уносе по наслову</translation>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
+        <source>Changed deleted objects</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <source>Adding missing icon %1</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
     <message>
-        <source>Password Generator</source>
-        <translation>Генератор Лозинки</translation>
+        <source>Create a new KeePassXC database...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Напредно</translation>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Корен</translation>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
     <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Увек дозволи приступ уносима</translation>
+        <source>WizardPage</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
+        <source>En&amp;cryption Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only the selected database has to be connected with a client.</source>
+        <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"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <source>Advanced Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
+        <source>Simple Settings</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <source>Encryption Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP Порт:</translation>
+        <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"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Подразумевани порт: 19455</translation>
+        <source>Database Master Key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <source>A master key known only to you protects your database.</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <source>General Database Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>OpenSSHKey</name>
+    <message>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation>Неисправна датотека са кључем, очекује се OpenSSH кључ</translation>
+    </message>
+    <message>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Base64 decoding failed</source>
+        <translation>Декодирање Base64 није успело</translation>
+    </message>
+    <message>
+        <source>Key file way too small.</source>
+        <translation>Кључ-датотека је превише мала.</translation>
+    </message>
+    <message>
+        <source>Key file magic header id invalid</source>
+        <translation>Идентификатор магичног заглавља Кључ-датотеке није валидан </translation>
+    </message>
+    <message>
+        <source>Found zero keys</source>
+        <translation>Није пронађен ниједан кључ</translation>
+    </message>
+    <message>
+        <source>Failed to read public key.</source>
+        <translation>Није могуће прочитати јавни кључ.</translation>
+    </message>
+    <message>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation>Кључ-датотека је корумпирана, није успело ишчитавање приватног кључа</translation>
+    </message>
+    <message>
+        <source>No private key payload to decrypt</source>
+        <translation>Нема приватног кључа за декриптовање</translation>
+    </message>
+    <message>
+        <source>Trying to run KDF without cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passphrase is required to decrypt this key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <source>Key derivation failed, key file corrupted?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
+        <source>Decryption failed, wrong passphrase?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF while reading private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation>Није могуће записати јавни кључ јер је празан</translation>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation>Неочекиван крај датотеке приликом уписивања јавног кључа</translation>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation>Није могуће записати приватни кључ јер је празан</translation>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation>Неочекиван крај датотеке приликом уписивања приватног кључа</translation>
+    </message>
+    <message>
+        <source>Unsupported key type: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cipher IV is too short for MD5 kdf</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown KDF: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown key type: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PasswordEditWidget</name>
+    <message>
+        <source>Enter password:</source>
+        <translation>Унесите лозинку:</translation>
+    </message>
+    <message>
+        <source>Confirm password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Лозинка</translation>
+    </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"/>
+    </message>
+    <message>
+        <source>Password cannot be empty.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passwords do not match.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate master password</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -3132,18 +3874,10 @@ Using default port 19455.</source>
         <translation>Листа речи:</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Број Фраза:</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>Разделник Фраза:</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>Генериши</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Кпирај</translation>
     </message>
@@ -3156,10 +3890,6 @@ Using default port 19455.</source>
         <translation>Затвори</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>Примени</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>Ентропија: %1 бит</translation>
     </message>
@@ -3187,51 +3917,200 @@ Using default port 19455.</source>
         <comment>Password quality</comment>
         <translation>Одличан</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Напредно</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>QObject</name>
+    <name>QApplication</name>
     <message>
-        <source>Database not opened</source>
+        <source>KeeShare</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>QFileDialog</name>
     <message>
-        <source>Database hash not available</source>
+        <source>Select</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>QMessageBox</name>
     <message>
-        <source>Client public key not received</source>
+        <source>Overwrite</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot decrypt message</source>
+        <source>Delete</source>
+        <translation>Обриши</translation>
+    </message>
+    <message>
+        <source>Move</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
+        <source>Empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Action cancelled or denied</source>
+        <source>Remove</source>
+        <translation>Уклони</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Онемогући</translation>
+    </message>
+    <message>
+        <source>Merge</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <source>Database not opened</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC association failed, try again</source>
+        <source>Database hash not available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key change was not successful</source>
+        <source>Client public key not received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Encryption key is not recognized</source>
+        <source>Cannot decrypt message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>No saved databases found</source>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -3360,10 +4239,6 @@ Using default port 19455.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3445,12 +4320,6 @@ Available commands:
         <translation>грешка приликом читања са уређаја</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>датотека је празна!
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation>неисправна ниска</translation>
     </message>
@@ -3459,6 +4328,371 @@ Available commands:
         <translation>недостаје завршни наводник</translation>
     </message>
     <message>
+        <source>Group</source>
+        <translation>Група</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Наслов</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Корисничко име</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Лозинка</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Белешке</translation>
+    </message>
+    <message>
+        <source>Last Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation>Интеграција са прегледачем</translation>
+    </message>
+    <message>
+        <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Press</source>
+        <translation>Притисни</translation>
+    </message>
+    <message>
+        <source>Passive</source>
+        <translation>Пасивно</translation>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation>SSH Агент</translation>
+    </message>
+    <message>
+        <source>Generate a new random diceware passphrase.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word count for the diceware passphrase.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wordlist for the diceware generator.
+[Default: EFF English]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new random password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>AES: 256-bit</source>
         <translation type="unfinished"/>
     </message>
@@ -3483,100 +4717,113 @@ Available commands:
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Group</source>
-        <translation>Група</translation>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Title</source>
-        <translation>Наслов</translation>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Корисничко име</translation>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Лозинка</translation>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Белешке</translation>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Last Modified</source>
+        <source>File %1 already exists.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Created</source>
+        <source>Loading the key file failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
+        <source>No key is set. Aborting database creation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Browser Integration</source>
-        <translation>Интеграција са прегледачем</translation>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
+        <source>Successfully created new database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Press</source>
-        <translation>Притисни</translation>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passive</source>
-        <translation>Пасивно</translation>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>SSH Agent</source>
-        <translation>SSH Агент</translation>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Generate a new random diceware passphrase.</source>
+        <source>Remove an entry from the database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word count for the diceware passphrase.</source>
+        <source>Path of the entry to remove.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>count</source>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist for the diceware generator.
-[Default: EFF English]</source>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Generate a new random password.</source>
+        <source>KeePassXC - cross-platform password manager</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Length of the generated password.</source>
+        <source>filenames of the password databases to open (*.kdbx)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
+        <source>path to a custom config file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
+        <source>key file of the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
+        <source>read password of the database from stdin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
+        <source>Parent window handle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Друга инстанца KeePassXC апликације је већ активна.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Грешка</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -3615,324 +4862,416 @@ Available commands:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
     <message>
-        <source>Search...</source>
+        <source>Agent connection failed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Претрага</translation>
+        <source>Agent protocol error.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Очисти</translation>
+        <source>No agent running, cannot add identity.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Case Sensitive</source>
+        <source>No agent running, cannot remove identity.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Limit search to selected group</source>
+        <source>Agent refused this identity. Possible reasons include:</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Service</name>
     <message>
-        <source>KeePassXC: New key association request</source>
+        <source>The key has already been added.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
+        <source>A confirmation request is not supported by the agent (check options).</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
+        <source>Search Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
+        <source>Every search term must match (ie, logical AND)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
+        <source>Modifiers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
+        <source>exclude term from results</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
+        <source>match term exactly</source>
         <translation type="unfinished"/>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    <message>
+        <source>use regex in term</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
+        <source>Fields</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <source>Term Wildcards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
+        <source>match anything</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <source>match one</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
+        <source>logical OR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
+        <source>Examples</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
+        <source>Search</source>
+        <translation>Претрага</translation>
+    </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
+        <source>Clear</source>
+        <translation>Очисти</translation>
+    </message>
+    <message>
+        <source>Limit search to selected group</source>
         <translation type="unfinished"/>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
+        <source>Case sensitive</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SettingsWidget</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>Application Settings</source>
+        <source>Active</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Опште</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
+        <source>Allow import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>Грешка приликом приступа конфигурационој датотеци %1</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
+        <source>Fingerprint:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
+        <source>Certificate:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
+        <source>Signer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
+        <source>Key:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
+        <source>Generate</source>
+        <translation>Генериши</translation>
+    </message>
+    <message>
+        <source>Import</source>
+        <translation>Увези</translation>
+    </message>
+    <message>
+        <source>Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
+        <source>Imported certificates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
+        <source>Trust</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically reload the database when modified externally</source>
+        <source>Ask</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
+        <source>Untrust</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
+        <source>Remove</source>
+        <translation>Уклони</translation>
+    </message>
+    <message>
+        <source>Path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
+        <source>Status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <source>Fingerprint</source>
+        <translation>Отисак прста</translation>
+    </message>
+    <message>
+        <source>Certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
+        <source>Trusted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show a system tray icon</source>
+        <source>Untrusted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
+        <source>Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
+        <source>KeeShare key file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
+        <source>All files</source>
+        <translation>Све датотеке</translation>
+    </message>
+    <message>
+        <source>Select path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Аутоматско-куцање</translation>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
+        <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"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Always ask before performing Auto-Type</source>
+        <source>Import from container without signature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
+        <source>Import from container with certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
+        <source>Not this time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
+        <source>Never</source>
+        <translation>Никада</translation>
+    </message>
+    <message>
+        <source>Always</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <source>Just this time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
+        <source>Import from %1 failed (%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
+        <source>Import from %1 successful (%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Опште</translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
+        <source>Signed share container are not supported - import prevented</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
+        <source>File is not readable</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
+        <source>Invalid sharing container</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
+        <source>Untrusted import prevented</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
+        <source>Successful signed import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
+        <source>Unexpected error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
+        <source>Unsigned share container are not supported - import prevented</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
+        <source>Successful unsigned import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
+        <source>File does not exist</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
+        <source>Unknown share container type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide entry notes by default</source>
+        <source>Overwriting signed share container is not supported - export prevented</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Privacy</source>
+        <source>Could not write export container (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
+        <source>Could not embed signature (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TotpDialog</name>
+    <message>
+        <source>Timed Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>000000</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Кпирај</translation>
+    </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></translation>
+    </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
+    <message>
+        <source>Copy</source>
+        <translation>Кпирај</translation>
+    </message>
+    <message>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>There was an error creating the QR code.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Closing in %1 seconds.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation type="unfinished"/>
@@ -3954,7 +5293,7 @@ Please unlock the selected database or choose another one which is unlocked.</so
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
+        <source>Custom Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -3962,7 +5301,12 @@ Please unlock the selected database or choose another one which is unlocked.</so
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>8 digits</source>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Code size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -3970,112 +5314,116 @@ Please unlock the selected database or choose another one which is unlocked.</so
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Code size:</source>
+        <source>7 digits</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
+        <source>8 digits</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
+        <source>Checking for updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
+        <source>Checking for updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Кпирај</translation>
+        <source>Close</source>
+        <translation>Затвори</translation>
     </message>
     <message>
-        <source>Expires in</source>
+        <source>Update Error!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
+        <source>An error occurred in retrieving update information.</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
+        <source>Please try again later.</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>WelcomeWidget</name>
     <message>
-        <source>Start storing your passwords securely in a KeePassXC database</source>
+        <source>Software Update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Create new database</source>
+        <source>A new version of KeePassXC is available!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open existing database</source>
+        <source>KeePassXC %1 is now available — you have %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import from KeePass 1</source>
+        <source>Download it at keepassxc.org</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import from CSV</source>
+        <source>You&apos;re up-to-date!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Recent databases</source>
+        <source>KeePassXC %1 is currently the newest version available</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>WelcomeWidget</name>
     <message>
-        <source>Welcome to KeePassXC %1</source>
+        <source>Start storing your passwords securely in a KeePassXC database</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>main</name>
     <message>
-        <source>Remove an entry from the database.</source>
+        <source>Create new database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Path of the database.</source>
-        <translation>Путања до базе података.</translation>
+        <source>Open existing database</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Path of the entry to remove.</source>
+        <source>Import from KeePass 1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - cross-platform password manager</source>
+        <source>Import from CSV</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
+        <source>Recent databases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>path to a custom config file</source>
+        <source>Welcome to KeePassXC %1</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>key file of the database</source>
+        <source>Refresh</source>
+        <translation>Освежи</translation>
+    </message>
+    <message>
+        <source>YubiKey Challenge-Response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
+        <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"/>
     </message>
     <message>
-        <source>Parent window handle</source>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No YubiKey inserted.</source>
         <translation type="unfinished"/>
     </message>
 </context>
diff --git a/share/translations/keepassx_sv.ts b/share/translations/keepassx_sv.ts
index d8b0cd0e0..178e717d9 100644
--- a/share/translations/keepassx_sv.ts
+++ b/share/translations/keepassx_sv.ts
@@ -38,12 +38,6 @@
         <translation>Kopiera till urklipp</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>Version %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>Ändring: %1</translation>
     </message>
@@ -76,34 +70,48 @@ Kärna: %3 %4</translation>
         <translation>Ett särskilt tack från teamet bakom KeePassXC riktas till debfx som skapade den ursprungliga KeePassX.</translation>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
+        <source>Version %1</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP Bekräfta åtkomst</translation>
+        <source>Build Type: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>Kom ihåg det här valet</translation>
+        <source>Auto-Type</source>
+        <translation>Autoskriv</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Tillåt</translation>
+        <source>Browser Integration</source>
+        <translation>Webbläsarintegration</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>Neka</translation>
+        <source>SSH Agent</source>
+        <translation>SSH Agent</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>%1 har begärt åtkomst till lösenorden för följande objekt.
-Vill du tillåta det?</translation>
+        <source>YubiKey</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -112,6 +120,277 @@ Vill du tillåta det?</translation>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>Aktivera SSH-agenten (kräver omstart)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Applikationsinställningar</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Allmänt</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Säkerhet</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Åtkomstfel för konfigurationsfil %1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Grund inställningar</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>Uppstart</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Tillåt endast en samtidig instans av KeePassXC</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Komihåg senaste databasen</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Ladda tidigare databaser vid uppstart</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>Minimera fönstret vid start av programmet</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>Filhantering</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation>Gör databasbackup innan sparning</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Spara automatiskt efter varje ändring</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Spara automatiskt när applikationen anslutas</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Markera inte databasen som ändrad vi icke-data förändringar (t.ex. öppna grupper)</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Ladda om databasen automatiskt när den ändras externt</translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>Posthantering</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>Använd gruppens ikon för nya poster</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Minimera vid kopiering</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Allmänt</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Visa statusfält ikon</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>Mörk ikon för systemfältet</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Vid minimering, minimera fönstret till systemfältet</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Språk</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Autoskriv</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>Använd postens titel för att matcha fönster för global auto-skriv</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>Använd postens URL för att matcha fönster för global auto-skriv</translation>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>Fråga alltid innan auto-skriv utförs</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Globalt auto-skriv kortkommando</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation>ms.</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>Tidsgränser</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>Rensa urklipp efter</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>sek</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>Lås databaser efter inaktivitet i</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>Bekvämlighet</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Lås databaserna när sessionen låses eller locket stängs</translation>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>Lås databaserna när fönstret minimeras</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>Behöver inte upprepa lösenord när det är synligt</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>Dölj posters anteckningar som standard</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>Integritet</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -215,6 +494,26 @@ Vill du tillåta det?</translation>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Avbryt</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -288,14 +587,6 @@ Vill du tillåta det?</translation>
         <translation>Sortera matchande autentiseringsuppgifter per &amp;användarnamn</translation>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>&amp;Koppla från alla browsers</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>Glöm alla ihågkomna &amp;rättigheter</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>Avancerat</translation>
     </message>
@@ -344,12 +635,12 @@ Vill du tillåta det?</translation>
     </message>
     <message>
         <source>Use a custom proxy location if you installed a proxy manually.</source>
-        <translation type="unfinished"/>
+        <translation>Använd en anpassad proxy-inställning om du har installerat en proxy manuellt.</translation>
     </message>
     <message>
         <source>Use a &amp;custom proxy location</source>
         <comment>Meant is the proxy for KeePassXC-Browser</comment>
-        <translation type="unfinished"/>
+        <translation>Använd en anpassad proxy</translation>
     </message>
     <message>
         <source>Browse...</source>
@@ -361,19 +652,36 @@ Vill du tillåta det?</translation>
         <translation>&lt;b&gt;Varning:&lt;/b&gt; Följande parametrar kan vara farliga!</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>Exekverbara filer (*.exe);;Alla filer (*.*)</translation>
+        <source>Select custom proxy location</source>
+        <translation>Välj en proxy</translation>
     </message>
     <message>
-        <source>Executable Files (*)</source>
-        <translation>Exekverbara filer (*)</translation>
+        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
+        <translation>Vi ber om ursäkt, KeePassXC-Browser stödjer inte Snap-releaser för tillfället.</translation>
     </message>
     <message>
-        <source>Select custom proxy location</source>
-        <translation>Välj en proxy</translation>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
+        <source>&amp;Tor Browser</source>
+        <translation type="unfinished"/>
+    </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: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not ask permission for HTTP &amp;Basic Auth</source>
+        <extracomment>An extra HTTP Basic Auth setting</extracomment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -412,148 +720,42 @@ Do you want to overwrite it?</source>
         <translation>Vill du uppdatera informationen i %1 - %2?</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Databasen är låst!</translation>
+        <source>Abort</source>
+        <translation>Avbryt</translation>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
+        <source>Converting attributes to custom data…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Inställningar är inte tillgängliga!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Inga nycklar hittade</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Nycklar borttagna från databasen</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>Raderar sparade rättigheter...</translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation>Avbryt</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Tog bort behörigheter</translation>
-    </message>
     <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
+        <source>Successfully moved %n keys to custom data.</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Ingen post med behörigheter hittades!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Den aktiva databasen innehåller inte en post med behörigheter.</translation>
-    </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>Lösenord</translation>
-    </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>Ange lösenord:</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>Repetera lösenord:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;Nyckel-fil</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>Bläddra</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Skapa</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Refresh</source>
-        <translation>Uppdatera</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>Nyckel-filer</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>Alla filer</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>Skapa nyckel-fil...</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>Kunde inte skapa nyckel-fil</translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>Välj nyckel-fil</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Tomt lösenord</translation>
-    </message>
-    <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>Vill du verkligen vill använda en tom sträng som lösenord?</translation>
-    </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>Olika lösenord angivna</translation>
-    </message>
-    <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>Kunde inte sätta %1 som nyckel-fil:
-%2</translation>
-    </message>
-    <message>
-        <source>Legacy key file format</source>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
         <translation type="unfinished"/>
     </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>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -600,7 +802,7 @@ Please consider generating a new key file.</source>
     </message>
     <message>
         <source>Text is qualified by</source>
-        <translation type="unfinished"/>
+        <translation>Text är kvalificerad av</translation>
     </message>
     <message>
         <source>Fields are separated by</source>
@@ -635,14 +837,6 @@ Please consider generating a new key file.</source>
         <translation>Finns inte i CSV filen</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>Tomt fältnamn </translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>kolumn</translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>Importerat från CSV fil</translation>
     </message>
@@ -651,47 +845,84 @@ Please consider generating a new key file.</source>
         <translation>Ursprungsdata:</translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>Ett eller flera fel upptäckta i CSV fil!</translation>
+        <source>Error</source>
+        <translation>Fel</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation>Fler meddelande hoppades över</translation>
+        <source>Empty fieldname %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Fel</translation>
+        <source>column %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>CSV importering: skrivare har fel:</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>Fel</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Kunde inte räkna nu master-nyckeln</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
-        <translation><numerusform>%n byte(s), </numerusform><numerusform>%n byte(s), </numerusform></translation>
+        <source>%n column(s)</source>
+        <translation><numerusform>%n kolumn(er)</numerusform><numerusform>%n kolumn(er)</numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
-        <translation><numerusform>%n rad(er),</numerusform><numerusform>%n rad(er), </numerusform></translation>
+        <source>%n byte(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
-        <translation><numerusform>%n kolumn(er)</numerusform><numerusform>%n kolumn(er)</numerusform></translation>
+        <source>%n row(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Root</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -721,14 +952,6 @@ Please consider generating a new key file.</source>
         <translation>Utmanings respons</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Kunde inte öppna databas.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Kan inte öppna nyckelfilen</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation type="unfinished"/>
     </message>
@@ -755,101 +978,168 @@ Please consider generating a new key file.</source>
         <source>Select key file</source>
         <translation>Välj nyckel-fil</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>Laga databasen</translation>
+        <source>TouchID for quick unlock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Fel</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Kan inte öppna nyckelfilen</translation>
+        <source>Can't open key file:
+%1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Kunde inte öppna databas.</translation>
+        <source>Passwords</source>
+        <translation>Lösenord</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
+    <message>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Allmänt</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Databas öppnades fint. Inget att göra.</translation>
+        <source>Security</source>
+        <translation>Säkerhet</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>Succé</translation>
+        <source>Master Key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>Databasens reparation har varit lyckad.
-Du kan nu spara den.</translation>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>Misslyckades med att laga databasen.</translation>
+        <source>Browser Integration</source>
+        <translation>Webbläsarintegration</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>Allmän</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>Kryptering</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>&amp;Koppla från alla browsers</translation>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
+        <source>Forg&amp;et all site-specific settings on entries</source>
         <translation type="unfinished"/>
     </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>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Understood, keep number</source>
+        <source>Stored keys</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>Avbryt</translation>
+        <source>Remove</source>
+        <translation>Ta bort</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
+        <source>Delete the selected key?</source>
         <translation type="unfinished"/>
     </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>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KDF unchanged</source>
-        <translation>KDF oförändrad</translation>
+        <source>Key</source>
+        <translation>Nyckel</translation>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <source>Value</source>
+        <translation>Värde</translation>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Hittade inga nycklar</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Nycklar borttagna från databasen</translation>
+    </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
-        <translation><numerusform> MiB</numerusform><numerusform> MiB</numerusform></translation>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Raderar sparade rättigheter...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Avbryt</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Tog bort behörigheter</translation>
     </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
-        <translation><numerusform>tråd(ar)</numerusform><numerusform>tråd(ar)</numerusform></translation>
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: Ingen post med behörigheter hittades!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Den aktiva databasen innehåller inte en post med behörigheter.</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
     </message>
 </context>
 <context>
@@ -884,8 +1174,111 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
     <message>
         <source>Parallelism:</source>
+        <translation>Parallelism:</translation>
+    </message>
+    <message>
+        <source>Decryption Time:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>?? s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>För högt antal omgångar</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"/>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation>Uppfattat, behåll nummer</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Avbryt</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>För lågt antal omgångar</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"/>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation>KDF oförändrad</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -935,91 +1328,110 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>Root</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 databas</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Alla filer</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Öppna databas</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>Filen kunde inte hittas!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Kunde inte öppna databas.</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>Fil öppnad i läs-enbart läge.</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>Öppna CSV fil</translation>
+        <source>Add additional protection...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>CSV-fil</translation>
+        <source>No encryption key added</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>Alla filer (*)</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Slå samman databas</translation>
+        <source>No password set</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Öppna KeePass 1 databas</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 type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1 databas</translation>
+        <source>Unknown error</source>
+        <translation>Okänt fel</translation>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>Stäng?</translation>
+        <source>Failed to change master key</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; är i redigeringsläge.
-Kasta ändringarna och stäng ändå?</translation>
+        <source>Database Name:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>Spara ändringar?</translation>
+        <source>Description:</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>&quot;%1&quot; har ändrats.
-Spara ändringarna?</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 databas</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Misslyckades med att skriva till databasen.</translation>
+        <source>All files</source>
+        <translation>Alla filer</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Lösenord</translation>
+        <source>Open database</source>
+        <translation>Öppna databas</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Spara databas som</translation>
+        <source>CSV file</source>
+        <translation>CSV-fil</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>Slå samman databas</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Öppna KeePass 1 databas</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 databas</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1030,38 +1442,39 @@ Spara ändringarna?</translation>
         <translation>Kunde inte skriva till CSV-filen</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>Ny databas</translation>
+        <source>Database creation error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>locked</source>
-        <translation>låst</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 type="unfinished"/>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>Lås databasen</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>Kan inte låsa databasen eftersom du håller på att redigera den.
-Tryck avbryt för att ansluta dina ändringar alternativt kasta dem.</translation>
+        <source>Select CSV file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>Databasen har ändrats.
-Vill du spara databasen innen du låser den?
-I annat fall försvinner ändringarna.</translation>
+        <source>New Database</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disable safe saves?</source>
-        <translation>Inaktivera spara säkert?</translation>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
     </message>
     <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>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1072,37 +1485,13 @@ Disable safe saves and try again?</source>
         <translation>Söker...</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>Ändra huvud lösenord</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>Ta bort post?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>Vill du verkligen ta bort &quot;%1&quot; för gott?</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Ta bort poster?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Vill du verkligen ta bort %1 poser för gott?</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Flytta post till soptunnan?</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation>Vill du verkligen flytta %n poster till papperskorgen?</translation>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Lägg poster i papperskorgen?</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
@@ -1120,18 +1509,10 @@ Disable safe saves and try again?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Ta bort grupp?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>Vill du verkligen ta bort gruppen &quot;%1&quot; för gott?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Kunde inte räkna nu master-nyckeln</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>Ingen nuvarande databas.</translation>
     </message>
@@ -1165,10 +1546,6 @@ Do you want to merge your changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>Töm papperskorgen?</translation>
     </message>
@@ -1176,88 +1553,103 @@ Do you want to merge your changes?</source>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>Generera TOTP Token</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Stäng</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Fil öppnad i läs-enbart läge.</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Allmän</translation>
+        <source>Lock Database?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Lösenord</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot; har ändrats.
+Spara ändringarna?</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>Utgår</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Användarnamn</translation>
+        <source>Save changes?</source>
+        <translation>Spara ändringar?</translation>
     </message>
     <message>
-        <source>Autotype</source>
-        <translation>Autotyp</translation>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>Söker</translation>
+        <source>Disable safe saves?</source>
+        <translation>Inaktivera spara säkert?</translation>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>Attribut</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Bilagor</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Anteckningar</translation>
+        <source>Passwords</source>
+        <translation>Lösenord</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>Fönster</translation>
+        <source>Save database as</source>
+        <translation>Spara databas som</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>Sekvens</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 databas</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Sök</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Rensa</translation>
+        <source>Delete group</source>
+        <translation>Ta bort grupp</translation>
     </message>
     <message>
-        <source>Never</source>
-        <translation>Aldrig</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[SKYDDAD]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>Inaktiverad</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Aktiverad</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1292,7 +1684,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>n/a</source>
-        <translation type="unfinished"/>
+        <translation>n/a</translation>
     </message>
     <message>
         <source>(encrypted)</source>
@@ -1300,7 +1692,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Select private key</source>
-        <translation type="unfinished"/>
+        <translation>Välj privat nyckel</translation>
     </message>
     <message>
         <source>File too large to be a private key</source>
@@ -1308,7 +1700,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Failed to open private key</source>
-        <translation type="unfinished"/>
+        <translation>Misslyckades med att öppna privat nyckel</translation>
     </message>
     <message>
         <source>Entry history</source>
@@ -1331,22 +1723,10 @@ Do you want to merge your changes?</source>
         <translation>Nytt attribut</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Bekräfta borttagning</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>Är du säker på att du vill ta bort detta attribut?</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[SKYDDAD]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>Imorgon</translation>
     </message>
@@ -1359,10 +1739,6 @@ Do you want to merge your changes?</source>
         <translation><numerusform>%n månad(er)</numerusform><numerusform>%n månad(er)</numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 år</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation>Använd genererat lösenord?</translation>
     </message>
@@ -1374,6 +1750,26 @@ Do you want to merge your changes?</source>
         <source>Entry updated successfully.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1430,7 +1826,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Window Associations</source>
-        <translation type="unfinished"/>
+        <translation>Fönsterassociering</translation>
     </message>
     <message>
         <source>+</source>
@@ -1547,7 +1943,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>n/a</source>
-        <translation type="unfinished"/>
+        <translation>n/a</translation>
     </message>
     <message>
         <source>Copy to clipboard</source>
@@ -1619,6 +2015,81 @@ Do you want to merge your changes?</source>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulär</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Lösenord:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1676,10 +2147,6 @@ Do you want to merge your changes?</source>
         <translation>Kunde inte hämta favicon.</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Tips: Du kan aktivera Google som reserv under Verktyg&gt;Inställningar&gt;Säkerhet</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>Bilder</translation>
     </message>
@@ -1688,25 +2155,45 @@ Do you want to merge your changes?</source>
         <translation>Alla filer</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Välj bild</translation>
+        <source>Custom icon already exists</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t read icon</source>
-        <translation>Kan inte läsa ikon</translation>
+        <source>Confirm Delete</source>
+        <translation>Bekräfta radering</translation>
     </message>
     <message>
-        <source>Custom icon already exists</source>
+        <source>Custom icon successfully downloaded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Confirm Delete</source>
-        <translation>Bekräfta radering</translation>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
+        <source>Select Image(s)</source>
         <translation type="unfinished"/>
     </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>
@@ -1755,9 +2242,8 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation>- Klon</translation>
+        <source>%1 - Clone</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1802,10 +2288,6 @@ This may cause the affected plugins to malfunction.</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Bekräfta borttagning</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>Spara bilagor</translation>
     </message>
@@ -1841,10 +2323,13 @@ This may cause the affected plugins to malfunction.</source>
 %1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>Lyckas inte öppna filer:
-%1</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1928,109 +2413,167 @@ This may cause the affected plugins to malfunction.</source>
         <source>Attachments</source>
         <translation>Bilagor</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>EntryView</name>
+    <name>EntryPreviewWidget</name>
     <message>
-        <source>Customize View</source>
-        <translation>Anpassa vy</translation>
+        <source>Generate TOTP Token</source>
+        <translation>Generera TOTP Token</translation>
     </message>
     <message>
-        <source>Hide Usernames</source>
-        <translation>Dölj användarnamn</translation>
+        <source>Close</source>
+        <translation>Stäng</translation>
     </message>
     <message>
-        <source>Hide Passwords</source>
-        <translation>Dölj lösenord</translation>
+        <source>General</source>
+        <translation>Allmänt</translation>
     </message>
     <message>
-        <source>Fit to window</source>
-        <translation>Anpassa till fönster</translation>
+        <source>Username</source>
+        <translation>Användarnamn</translation>
     </message>
     <message>
-        <source>Fit to contents</source>
-        <translation>Anpassa för innehåll</translation>
+        <source>Password</source>
+        <translation>Lösenord</translation>
     </message>
     <message>
-        <source>Reset to defaults</source>
-        <translation>Återställ till standardvärden</translation>
+        <source>Expiration</source>
+        <translation>Utgår</translation>
     </message>
     <message>
-        <source>Attachments (icon)</source>
-        <translation>Bilagor (ikon)</translation>
+        <source>URL</source>
+        <translation>URL</translation>
     </message>
-</context>
-<context>
-    <name>Group</name>
     <message>
-        <source>Recycle Bin</source>
-        <translation>Papperskorg</translation>
+        <source>Attributes</source>
+        <translation>Attribut</translation>
     </message>
-</context>
-<context>
-    <name>HostInstaller</name>
     <message>
-        <source>KeePassXC: Cannot save file!</source>
-        <translation>KeePassXC: Kan inte spara fil!</translation>
+        <source>Attachments</source>
+        <translation>Bilagor</translation>
     </message>
     <message>
-        <source>Cannot save the native messaging script file.</source>
+        <source>Notes</source>
+        <translation>Anteckningar</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Autotyp</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Fönster</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Sekvens</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Söker</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Sök</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Rensa</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Aldrig</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[SKYDDAD]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>HttpPasswordGeneratorWidget</name>
     <message>
-        <source>Length:</source>
-        <translation>Längd:</translation>
+        <source>Enabled</source>
+        <translation>Aktiverad</translation>
     </message>
     <message>
-        <source>Character Types</source>
-        <translation>Teckentyper</translation>
+        <source>Disabled</source>
+        <translation>Inaktiverad</translation>
     </message>
     <message>
-        <source>Upper Case Letters</source>
-        <translation>Versaler</translation>
+        <source>Share</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>EntryView</name>
     <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
+        <source>Customize View</source>
+        <translation>Anpassa vy</translation>
     </message>
     <message>
-        <source>Lower Case Letters</source>
-        <translation>Gemener</translation>
+        <source>Hide Usernames</source>
+        <translation>Dölj användarnamn</translation>
     </message>
     <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
+        <source>Hide Passwords</source>
+        <translation>Dölj lösenord</translation>
     </message>
     <message>
-        <source>Numbers</source>
-        <translation>Siffror</translation>
+        <source>Fit to window</source>
+        <translation>Anpassa till fönster</translation>
     </message>
     <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
+        <source>Fit to contents</source>
+        <translation>Anpassa för innehåll</translation>
     </message>
     <message>
-        <source>Special Characters</source>
-        <translation>Specialtecken</translation>
+        <source>Reset to defaults</source>
+        <translation>Återställ till standardvärden</translation>
     </message>
     <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
+        <source>Attachments (icon)</source>
+        <translation>Bilagor (ikon)</translation>
     </message>
+</context>
+<context>
+    <name>Group</name>
     <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Uteslut liknande tecken</translation>
+        <source>Recycle Bin</source>
+        <translation>Papperskorg</translation>
     </message>
     <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>Säkerställ att lösenordet innehåller tecken från varje grupp</translation>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>GroupModel</name>
     <message>
-        <source>Extended ASCII</source>
-        <translation>Utökad ASCII</translation>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation>KeePassXC: Kan inte spara fil!</translation>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2058,6 +2601,26 @@ This may cause the affected plugins to malfunction.</source>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Fel lösenord eller korrupt databas-fil</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2217,10 +2780,6 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation type="unfinished"/>
     </message>
@@ -2271,6 +2830,18 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Unsupported KeePass 2 database version.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2343,10 +2914,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation type="unfinished"/>
     </message>
@@ -2384,7 +2951,7 @@ 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>Felaktigt numeriskt värde</translation>
     </message>
     <message>
         <source>Invalid uuid value</source>
@@ -2395,6 +2962,12 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2558,28 +3131,126 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Invalid entry field type</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <source>Disabled share</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <source>Import from</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>En annan instans av KeePassXC körs redan.</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Allvarligt fel vid testning av kryptografiska funktioner.</translation>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Fel</translation>
+        <source>Key Component</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Avbryt</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>Bläddra</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Generera</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Nyckel-filer</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Alla filer</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Skapa nyckel-fil...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Välj nyckel-fil</translation>
     </message>
 </context>
 <context>
@@ -2593,10 +3264,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Importera</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation>&amp;Hjälp</translation>
     </message>
@@ -2605,14 +3272,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>Kopiera att&amp;ribut till urklipp</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation>Tidsbaserat engångslösenord</translation>
-    </message>
-    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Grupper</translation>
     </message>
@@ -2641,30 +3300,10 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Stäng databas</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>&amp;Ny databas</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>Sammanfoga med KeePassX databas</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>&amp;Lägg till ny post</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>&amp;Visa/redigera post</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>&amp;Radera post</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>&amp;Lägg till ny grupp</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>&amp;Redigera grupp</translation>
     </message>
@@ -2677,14 +3316,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Sp&amp;ara databas som...</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Ändra &amp;huvudlösenord</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>&amp;Databasinställningar</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>Databasinställningar</translation>
     </message>
@@ -2693,10 +3324,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Klona post</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>&amp;Hitta</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>Kopiera &amp;användarnamn</translation>
     </message>
@@ -2705,10 +3332,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Kopiera användarnamn</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>Kop&amp;iera lösenord</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>Kopiera lösenord</translation>
     </message>
@@ -2721,14 +3344,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Lösenordsgenerator</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>&amp;Öppna URL</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>&amp;Lås databas</translation>
     </message>
@@ -2761,22 +3376,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Exportera till CSV-fil...</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Importera KeePass 1 databas...</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>Importera CSV fil...</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Re&amp;parera databas...</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>Visa TOTP</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>Konfigurera TOTP...</translation>
     </message>
@@ -2797,14 +3396,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Åtkomstfel för konfigurationsfil %1</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>läs bara</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Inställningar</translation>
     </message>
@@ -2817,253 +3408,404 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Avsluta KeePassXC</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 databas</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Alla filer</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Öppna databas</translation>
+        <source>&amp;Donate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Spara lagad databas</translation>
+        <source>Report a &amp;bug</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Misslyckades med att skriva till databasen.</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
+        <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
+        <source>Copy att&amp;ribute...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>OpenSSHKey</name>
+    <name>Merger</name>
     <message>
-        <source>Invalid key file, expecting an OpenSSH key</source>
+        <source>Creating missing %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>PEM boundary mismatch</source>
+        <source>Relocating %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Base64 decoding failed</source>
+        <source>Overwriting %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key file way too small.</source>
+        <source>older entry merged from database &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key file magic header id invalid</source>
+        <source>Adding backup for older target %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Found zero keys</source>
+        <source>Adding backup for older source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to read public key.</source>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Corrupted key file, reading private key failed</source>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>No private key payload to decrypt</source>
+        <source>Synchronizing from newer source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Trying to run KDF without cipher</source>
+        <source>Synchronizing from older source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase is required to decrypt this key</source>
+        <source>Deleting child %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key derivation failed, key file corrupted?</source>
+        <source>Deleting orphan %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Decryption failed, wrong passphrase?</source>
+        <source>Changed deleted objects</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unexpected EOF while reading public key</source>
+        <source>Adding missing icon %1</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
     <message>
-        <source>Unexpected EOF while reading private key</source>
+        <source>Create a new KeePassXC database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t write public key as it is empty</source>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Root</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unexpected EOF when writing public key</source>
+        <source>En&amp;cryption Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t write private key as it is empty</source>
+        <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"/>
     </message>
     <message>
-        <source>Unexpected EOF when writing private key</source>
+        <source>Advanced Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported key type: %1</source>
+        <source>Simple Settings</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
     <message>
-        <source>Unknown cipher: %1</source>
+        <source>Encryption Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cipher IV is too short for MD5 kdf</source>
+        <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"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
     <message>
-        <source>Unknown KDF: %1</source>
-        <translation>Okänd KDF: %1</translation>
+        <source>Database Master Key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unknown key type: %1</source>
-        <translation>Okänd nyckeltyp: %1</translation>
+        <source>A master key known only to you protects your database.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>NewDatabaseWizardPageMetaData</name>
     <message>
-        <source>Dialog</source>
-        <translation>Dialogruta</translation>
+        <source>General Database Information</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
+        <source>Please fill in the display name and an optional description for your new database:</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>Aktivera KeePassHTTP server</translation>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Allmän</translation>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <source>Base64 decoding failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>Returnerar bara de lämpligaste posterna för en viss webbadress istället för alla poster som rör den domänen.</translation>
+        <source>Key file way too small.</source>
+        <translation>Nyckelfilen är alldeles för liten</translation>
     </message>
     <message>
-        <source>&amp;Return only best matching entries</source>
+        <source>Key file magic header id invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Begär att låsa upp databasen om den är låst</translation>
+        <source>Found zero keys</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
+        <source>Failed to read public key.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Match URL schemes</source>
+        <source>Corrupted key file, reading private key failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
+        <source>No private key payload to decrypt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
+        <source>Trying to run KDF without cipher</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
+        <source>Passphrase is required to decrypt this key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <source>Key derivation failed, key file corrupted?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>Lösenordsgenerator</translation>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Avancerat</translation>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
+        <source>Unexpected EOF while reading private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
+        <source>Can&apos;t write public key as it is empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>Endast den valda databasen måste vara ansluten med en klient.</translation>
+        <source>Unexpected EOF when writing public key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <source>Can&apos;t write private key as it is empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>Automatiskt skapande eller uppdaterande av strängfält stöds inte.</translation>
+        <source>Unexpected EOF when writing private key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <source>Unsupported key type: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP Port:</translation>
+        <source>Unknown cipher: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Standard port: 19455</translation>
+        <source>Cipher IV is too short for MD5 kdf</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC kommer att lyssna på denna port på 127.0.0.1</translation>
+        <source>Unknown KDF: %1</source>
+        <translation>Okänd KDF: %1</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;Varning:&lt;/b&gt; Följande parametrar kan vara farliga!</translation>
+        <source>Unknown key type: %1</source>
+        <translation>Okänd nyckeltyp: %1</translation>
+    </message>
+</context>
+<context>
+    <name>PasswordEditWidget</name>
+    <message>
+        <source>Enter password:</source>
+        <translation>Ange lösenord:</translation>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <source>Confirm password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
+        <source>Password</source>
+        <translation>Lösenord</translation>
+    </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"/>
+    </message>
+    <message>
+        <source>Password cannot be empty.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passwords do not match.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
+        <source>Generate master password</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -3120,7 +3862,7 @@ Using default port 19455.</source>
     </message>
     <message>
         <source>Pick characters from every group</source>
-        <translation type="unfinished"/>
+        <translation>Välj tecken från alla grupper</translation>
     </message>
     <message>
         <source>&amp;Length:</source>
@@ -3135,18 +3877,10 @@ Using default port 19455.</source>
         <translation>Ordlista:</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Antal ord:</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>Ord separerare:</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>Generera</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Kopiera</translation>
     </message>
@@ -3159,10 +3893,6 @@ Using default port 19455.</source>
         <translation>Stäng</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>Utför</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation type="unfinished"/>
     </message>
@@ -3190,6 +3920,171 @@ Using default port 19455.</source>
         <comment>Password quality</comment>
         <translation>Utmärkt</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Avancerat</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Ta bort</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Ta bort</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Stäng av</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3210,34 +4105,18 @@ Using default port 19455.</source>
         <translation>Kan inte avkoda meddelande</translation>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Action cancelled or denied</source>
         <translation>Åtgärden avbröts eller nekades</translation>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>KeePassXC association failed, try again</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key change was not successful</source>
-        <translation>Nyckelbytet misslyckades</translation>
-    </message>
-    <message>
         <source>Encryption key is not recognized</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>No saved databases found</source>
-        <translation>Ingen sparad databas hittades</translation>
-    </message>
-    <message>
         <source>Incorrect action</source>
         <translation>Felaktig åtgärd</translation>
     </message>
@@ -3363,10 +4242,6 @@ Using default port 19455.</source>
         <translation>Ange lösenordet för att låsa upp %1: </translation>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation>Misslyckades med att ladda nyckelfilen %1: %2</translation>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3448,12 +4323,6 @@ Tillgängliga kommandon:
         <translation>fel vid läsning från enhet</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>filen är tom!
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation>felaktigt uppbyggd textsträng</translation>
     </message>
@@ -3462,30 +4331,6 @@ Tillgängliga kommandon:
         <translation>saknar avslutande citattecken</translation>
     </message>
     <message>
-        <source>AES: 256-bit</source>
-        <translation>AES: 256-bitar</translation>
-    </message>
-    <message>
-        <source>Twofish: 256-bit</source>
-        <translation>Twofish: 256-bitar</translation>
-    </message>
-    <message>
-        <source>ChaCha20: 256-bit</source>
-        <translation>ChaCha20: 256-bitar</translation>
-    </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – rekommenderad)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 4)</source>
-        <translation>AES-KDF (KDBX 4)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 3.1)</source>
-        <translation>AES-KDF (KDBX 3.1)</translation>
-    </message>
-    <message>
         <source>Group</source>
         <translation>Grupp</translation>
     </message>
@@ -3514,10 +4359,6 @@ Tillgängliga kommandon:
         <translation>Skapad</translation>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Browser Integration</source>
         <translation>Webbläsarintegration</translation>
     </message>
@@ -3546,10 +4387,6 @@ Tillgängliga kommandon:
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>count</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Wordlist for the diceware generator.
 [Default: EFF English]</source>
         <translation type="unfinished"/>
@@ -3559,28 +4396,438 @@ Tillgängliga kommandon:
         <translation>Generera ett nytt slumpmässigt lösenord.</translation>
     </message>
     <message>
-        <source>Length of the generated password.</source>
-        <translation>Längden av det genererade lösenordet.</translation>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
-        <translation>Använd gemener i det genererade lösenordet.</translation>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
-        <translation>Använd versaler i det genererade lösenordet.</translation>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256-bitar</translation>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
-        <translation>Använd siffror i det genererade lösenordet.</translation>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256-bitar</translation>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
-        <translation>Använd specialtecken i det genererade lösenordet.</translation>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256-bitar</translation>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
-        <translation>Använd utökad ASCII i det genererade lösenordet.</translation>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – rekommenderad)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>Ta bort en post från databasen</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>Sökväg till posten som tas bort</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - plattformsoberoende lösenordshanterare</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>namnen på lösenordsdatabaserna som öppnas (*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>Sökväg till egen konfigurations-fil</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>nyckel-fil för databas</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>mottag databaslösenord från stdin</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>En annan instans av KeePassXC körs redan.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Allvarligt fel vid testning av kryptografiska funktioner.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Fel</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3618,12 +4865,98 @@ Tillgängliga kommandon:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
+    <message>
+        <source>Agent connection failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <source>Search...</source>
-        <translation>Sök...</translation>
+        <source>No agent running, cannot add identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation type="unfinished"/>
     </message>
     <message>
+        <source>logical OR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
         <source>Search</source>
         <translation>Sök</translation>
     </message>
@@ -3632,310 +4965,316 @@ Tillgängliga kommandon:
         <translation>Rensa</translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Skiftlägeskänslig</translation>
-    </message>
-    <message>
         <source>Limit search to selected group</source>
         <translation>Begränsa sökningen till vald grupp</translation>
     </message>
-</context>
-<context>
-    <name>Service</name>
     <message>
-        <source>KeePassXC: New key association request</source>
+        <source>Search Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: Skriv över befintlig nyckel?</translation>
+        <source>Case sensitive</source>
+        <translation>Skiftlägeskänslig</translation>
     </message>
+</context>
+<context>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
+        <source>Active</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: Uppdatera post</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Vill du uppdatera informationen i %1 - %2?</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Databasen är låst!</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
+        <source>Fingerprint:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Nycklar borttagna från databasen</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    <message>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Hittade inga nycklar</translation>
+        <source>Key:</source>
+        <translation>Nyckel:</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Generera</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <source>Import</source>
+        <translation>Importera</translation>
+    </message>
+    <message>
+        <source>Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Inställningar är inte tillgängliga!</translation>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <source>Trust</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>Tar bort lagrade behörigheter...</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>Avbryt</translation>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Tog bort behörigheter</translation>
+        <source>Remove</source>
+        <translation>Ta bort</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation><numerusform>Framgångsrikt bort behörigheter från %n poster.</numerusform><numerusform>Lyckades ta bort behörigheter från %n poster.</numerusform></translation>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: Ingen post med behörigheter hittades!</translation>
+        <source>Status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Den aktiva databasen innehåller inte en post med behörigheter.</translation>
+        <source>Fingerprint</source>
+        <translation>Fingeravtryck</translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
-        <translation>Applikationsinställningar</translation>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Allmän</translation>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>Säkerhet</translation>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>Åtkomstfel för konfigurationsfil %1</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>Grund inställningar</translation>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Tillåt endast en samtidig instans av KeePassXC</translation>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>Komihåg senaste databasen</translation>
+        <source>All files</source>
+        <translation>Alla filer</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
+        <source>Select path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Ladda tidigare databaser vid uppstart</translation>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>Spara automatiskt när applikationen anslutas</translation>
+        <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"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>Spara automatiskt efter varje ändring</translation>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Ladda om databasen automatiskt när den ändras externt</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>Minimera vid kopiering</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Minimera fönstret vid start av programmet</translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>Använd gruppens ikon för nya poster</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Markera inte databasen som ändrad vi icke-data förändringar (t.ex. öppna grupper)</translation>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
-        <translation>Dölj detaljvyn</translation>
+        <source>Never</source>
+        <translation>Aldrig</translation>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>Visa statusfält ikon</translation>
+        <source>Always</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>Vid minimering, minimera fönstret till systemfältet</translation>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
-        <translation>Vid stängning, minimera fönstret till systemfältet istället</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
-        <translation>Mörk ikon för systemfältet</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Språk</translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Auto-skriv</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>Använd postens titel för att matcha fönster för global auto-skriv</translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>Använd postens URL för att matcha fönster för global auto-skriv</translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation>Fråga alltid innan auto-skriv utförs</translation>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Globalt auto-skriv kortkommando</translation>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>Auto-skriv fördröjning</translation>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation>ms.</translation>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
-        <translation>Uppstart</translation>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
-        <translation>Filhantering</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <source>Unknown share container type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
-        <translation>Gör databasbackup innan sparning</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
-        <translation>Posthantering</translation>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Allmän</translation>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
-        <translation>Tidsgränser</translation>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>Rensa urklipp efter</translation>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>sek</translation>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>Lås databaser efter inaktivitet i</translation>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Bekvämlighet</translation>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Lås databaserna när sessionen låses eller locket stängs</translation>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>Lås databaserna när fönstret minimeras</translation>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>TotpDialog</name>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>Behöver inte upprepa lösenord när det är synligt</translation>
+        <source>Timed Password</source>
+        <translation>Tidsinställt Lösenord</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Visa lösenord i klartext som standard</translation>
+        <source>000000</source>
+        <translation>000000</translation>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
-        <translation>Dölj lösenord i förhandsgranskningsrutan</translation>
+        <source>Copy</source>
+        <translation>Kopiera</translation>
+    </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
     <message>
-        <source>Hide entry notes by default</source>
-        <translation>Dölj posters anteckningar som standard</translation>
+        <source>Copy</source>
+        <translation>Kopiera</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>Integritet</translation>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>Använd Google som reserv för att ladda ner webbplatsikoner</translation>
+        <source>There was an error creating the QR code.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <source>Closing in %1 seconds.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation>Konfigurera TOTP</translation>
@@ -3957,59 +5296,84 @@ Please unlock the selected database or choose another one which is unlocked.</so
         <translation>Använd anpassade inställningar</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>Obs: Ändra bara dessa inställningar om du vet vad du gör.</translation>
+        <source>Custom Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Time step:</source>
         <translation>Tidsteg:</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8 siffror</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>sek</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>Kodstorlek:</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6 siffror</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>Kodstorlek:</translation>
+        <source>7 digits</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>sek</translation>
+        <source>8 digits</source>
+        <translation>8 siffror</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>Tidsinställt Lösenord</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Kopiera</translation>
+        <source>Close</source>
+        <translation>Stäng</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>Går ut om</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>sekunder</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>Lås upp databas</translation>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4044,41 +5408,25 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
 </context>
 <context>
-    <name>main</name>
-    <message>
-        <source>Remove an entry from the database.</source>
-        <translation>Ta bort en post från databasen</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>Sökväg till databasen</translation>
-    </message>
-    <message>
-        <source>Path of the entry to remove.</source>
-        <translation>Sökväg till posten som tas bort</translation>
-    </message>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - plattformsoberoende lösenordshanterare</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>namnen på lösenordsdatabaserna som öppnas (*.kdbx)</translation>
+        <source>Refresh</source>
+        <translation>Uppdatera</translation>
     </message>
     <message>
-        <source>path to a custom config file</source>
-        <translation>Sökväg till egen konfigurations-fil</translation>
+        <source>YubiKey Challenge-Response</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>nyckel-fil för databas</translation>
+        <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"/>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>mottag databaslösenord från stdin</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Parent window handle</source>
+        <source>No YubiKey inserted.</source>
         <translation type="unfinished"/>
     </message>
 </context>
diff --git a/share/translations/keepassx_th.ts b/share/translations/keepassx_th.ts
index 39920a742..a7fbc578f 100644
--- a/share/translations/keepassx_th.ts
+++ b/share/translations/keepassx_th.ts
@@ -39,12 +39,6 @@
         <translation>คัดลอกไปยังคลิปบอร์ด:</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>รุ่น %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>การปรับปรุง: %1</translation>
     </message>
@@ -77,32 +71,47 @@ Kernel: %3 %4</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
+        <source>Version %1</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
+        <source>Build Type: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>จำการตัดสินใจนี้</translation>
+        <source>Auto-Type</source>
+        <translation>Auto-Type</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>อนุญาต</translation>
+        <source>Browser Integration</source>
+        <translation>การทำงานร่วมกับเบราว์เซอร์</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>ปฏิเสธ</translation>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>%1 has requested access to passwords for the following item(s).
-Please select whether you want to allow access.</source>
+        <source>YubiKey</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -112,6 +121,277 @@ Please select whether you want to allow access.</source>
         <source>Enable SSH Agent (requires restart)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>การตั้งค่าแอป</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>ทั่วไป</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>ความมั่นคง</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>มีข้อผิดพลาดในการเข้าถึงแฟ้มตั้งค่า %1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>การตั้งค่าพื้นฐาน</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>จำฐานข้อมูลล่าสุด</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>ย่อหน้าต่างลงเล็กสุดตอนเริ่มแอป</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>บันทึกอัตโนมัติทุกครั้งที่มีการเปลี่ยนแปลง</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>บันทึกอัตโนมัติตอนออก</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>ย่อหน้าต่างเมื่อคัดลอกไปยังคลิปบอร์ด</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>ทั่วไป</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>แสดงไอคอนสำหรับ system tray</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>ภาษา</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Auto-Type</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation>มิลลิวิ</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>ล้างคลิปบอร์ดหลัง</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>วิ</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>ล็อกฐานข้อมูลหลังไม่มีการใช้งาน</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>ความสะดวก</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>ล็อกฐานข้อมูลหลังย่อหน้าต่างลงเล็กสุด</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>ไม่ต้องถามรหัสผ่านซ้ำถ้ามองเห็นรหัสผ่านอยู่</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>ความเป็นส่วนตัว</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -214,6 +494,26 @@ Please select whether you want to allow access.</source>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>ยกเลิก</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -287,14 +587,6 @@ Please select whether you want to allow access.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>หยุดการเชื่อมต่อกับทุกเบราว์เซอร์ (&amp;D)</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>ลืมการอนุญาตที่เคยจำไว้ทั้งหมด (&amp;P)</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>ขั้นสูง</translation>
     </message>
@@ -360,19 +652,36 @@ Please select whether you want to allow access.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <source>Select custom proxy location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Executable Files (*)</source>
+        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Select custom proxy location</source>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
+        <source>&amp;Tor Browser</source>
+        <translation type="unfinished"/>
+    </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: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not ask permission for HTTP &amp;Basic Auth</source>
+        <extracomment>An extra HTTP Basic Auth setting</extracomment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -411,147 +720,42 @@ Do you want to overwrite it?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: ฐานข้อมูลล็อกอยู่!</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: ไม่มีการตั้งค่าที่ใช้ได้!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: ไม่พบกุญแจ</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: เอากุญแจออกจากฐานข้อมูล</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation type="unfinished"><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>หยุด</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: การอนุญาตถูกนำออก</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation type="unfinished"><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <source>KeePassXC: No entry with permissions found!</source>
+        <source>Converting attributes to custom data…</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
     <message>
-        <source>Password</source>
-        <translation>รหัสผ่าน</translation>
-    </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>ป้อนรหัสผ่าน:</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>ทวนรหัสผ่าน:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>แฟ้มกุญแจ (&amp;K)</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>ดู</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>สร้าง</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>รหัสสอบถาม รหัสตอบกลับ (&amp;L)</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>เรียกใหม่</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>แฟ้มกุญแจ</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>ทุกแฟ้ม</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>สร้างแฟ้มกุญแจ...</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>ไม่สามารถสร้างแฟ้มกุญแจได้ :</translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>เลือกแฟ้มกุญแจ</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>รหัสผ่านว่างเปล่า</translation>
-    </message>
-    <message>
-        <source>Do you really want to use an empty string as password?</source>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>รหัสผ่านที่ให้มาไม่ตรงกัน</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Legacy key file format</source>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
         <translation type="unfinished"/>
     </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>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -633,14 +837,6 @@ Please consider generating a new key file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>ชื่อฟิลด์ว่างเปล่า</translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>หลัก</translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>นำเข้าจากแฟ้ม CSV แล้ว</translation>
     </message>
@@ -649,48 +845,84 @@ Please consider generating a new key file.</source>
         <translation>ข้อมูลต้นฉบับ:</translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>พบข้อผิดพลาดในแฟ้ม CSV !</translation>
+        <source>Error</source>
+        <translation>ผิดพลาด</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation>มีข้อความอีกมากที่ถูกข้ามไป]</translation>
+        <source>Empty fieldname %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>ผิดพลาด</translation>
+        <source>column %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>การนำเข้า CSV: ตัวเขียนมีข้อผิดพลาด:
-</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>ผิดพลาด</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>ไม่สามารถคำนวญกุญแมาสเตอร์ได้</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
-        <translation><numerusform>%n ไบต์, </numerusform></translation>
+        <source>%n column(s)</source>
+        <translation><numerusform>%n คอลัมน์</numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
-        <translation><numerusform>%n แถว, </numerusform></translation>
+        <source>%n byte(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
-        <translation><numerusform>%n คอลัมน์</numerusform></translation>
+        <source>%n row(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>รูต</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -720,14 +952,6 @@ Please consider generating a new key file.</source>
         <translation>รหัสสอบถาม รหัสตอบกลับ:</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>ไม่สามารถเปิดฐานข้อมูลดังกล่าว</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>ไม่สามารถเปิดแฟ้มกุญแจ</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation type="unfinished"/>
     </message>
@@ -754,102 +978,169 @@ Please consider generating a new key file.</source>
         <source>Select key file</source>
         <translation>เลือกแฟ้มกุญแจ</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>ซ่อมฐานข้อมูล</translation>
+        <source>TouchID for quick unlock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>ผิดพลาด</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>ไม่สามารถเปิดแฟ้มกุญแจ</translation>
+        <source>Can't open key file:
+%1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>ไม่สามารถเปิดฐานข้อมูลดังกล่าว</translation>
+        <source>Passwords</source>
+        <translation>รหัสผ่าน</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
+    <message>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>ทั่วไป</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>ฐานข้อมูลเปิดได้ปกติ ไม่ต้องทำอะไร</translation>
+        <source>Security</source>
+        <translation>ความมั่นคง</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>สำเร็จ</translation>
+        <source>Master Key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>ฐานข้อมูลดังกล่าวถูกซ่อมสำเร็จแล้ว
-ตอนนี้คุณสามารถบันทึกมันได้</translation>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>ไม่สามารถซ่อมฐานข้อมูลดังกล่าว</translation>
+        <source>Browser Integration</source>
+        <translation>การทำงานร่วมกับเบราว์เซอร์</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>ทั่วไป</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>การเข้ารหัสลับ</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>หยุดการเชื่อมต่อกับทุกเบราว์เซอร์ (&amp;D)</translation>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
+        <source>Forg&amp;et all site-specific settings on entries</source>
         <translation type="unfinished"/>
     </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>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Understood, keep number</source>
+        <source>Stored keys</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>ยกเลิก</translation>
+        <source>Remove</source>
+        <translation>นำออก</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
+        <source>Delete the selected key?</source>
         <translation type="unfinished"/>
     </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>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KDF unchanged</source>
+        <source>Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: ไม่พบกุญแจ</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: กุญแจถูกนำออกจากฐานข้อมูล</translation>
+    </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>หยุด</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: การอนุญาตถูกนำออก</translation>
+    </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
+        <source>Successfully removed permissions from %n entry(s).</source>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetEncryption</name>
@@ -885,6 +1176,109 @@ If you keep this number, your database may be too easy to crack!</source>
         <source>Parallelism:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>ยกเลิก</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -934,91 +1328,110 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>รูต</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>ฐานข้อมูล KeePass 2</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>ทุกแฟ้ม</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>เปิดฐานข้อมูล</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>ไม่พบแฟ้ม!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>ไม่สามารถเปิดฐานข้อมูลดังกล่าว</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>เปิดแฟ้มแล้วในแบบอ่านอย่างเดียว</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>เปิดแฟ้ม CSV</translation>
+        <source>Add additional protection...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>แฟ้ม CSV</translation>
+        <source>No encryption key added</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>ทุกแฟ้ม ()</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>ผสานฐานข้อมูล</translation>
+        <source>No password set</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>เปิดฐานข้อมูล KeePass 1</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 type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>ฐานข้อมูล KeePass 1</translation>
+        <source>Unknown error</source>
+        <translation>ความผิดพลาดที่ไม่รู้จัก</translation>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>ปิด?</translation>
+        <source>Failed to change master key</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; อยู่ในระหว่าการแก้ไข
-ละทิ้งการเปลี่ยนแปลงทั้งหมดและปิดอยู่ดี?</translation>
+        <source>Database Name:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>บันทึกความเปลี่ยนแปลง?</translation>
+        <source>Description:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
+    <message>
+        <source>KeePass 2 Database</source>
+        <translation>ฐานข้อมูล KeePass 2</translation>
     </message>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>&quot;%1&quot; ถูกแก้ไข
-บันทึกการเปลี่ยนแปลง?</translation>
+        <source>All files</source>
+        <translation>ทุกแฟ้ม</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>การเขียนฐานข้อมูลล้มเหลว</translation>
+        <source>Open database</source>
+        <translation>เปิดฐานข้อมูล</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>รหัสผ่าน</translation>
+        <source>CSV file</source>
+        <translation>แฟ้ม CSV</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>บันทึกฐานข้อมูลเป็น</translation>
+        <source>Merge database</source>
+        <translation>ผสานฐานข้อมูล</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>เปิดฐานข้อมูล KeePass 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>ฐานข้อมูล KeePass 1</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1029,35 +1442,39 @@ Save changes?</source>
         <translation>การเขียนแฟ้ม CSV ล้มเหลว</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>ฐานข้อมูลใหม่</translation>
+        <source>Database creation error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>locked</source>
-        <translation>ถูกล็อก</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 type="unfinished"/>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>ล็อกฐานข้อมูล</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
+        <source>Select CSV file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
+        <source>New Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disable safe saves?</source>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
         <translation type="unfinished"/>
     </message>
     <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>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1068,37 +1485,13 @@ Disable safe saves and try again?</source>
         <translation>ค้นหา...</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>เปลี่ยนกุญแจมาสเตอร์</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>ลบรายการ?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>คุณต้องการจะลบรายการ &quot;%1&quot; ให้หายไปตลอดกาลจริงๆ?</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>ลบรายการ?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>คุณต้องการจะลบรายการ %1 รายการให้หายไปตลอดกาลจริงๆ?</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>ย้ายรายการไปถังขยะ?</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation type="unfinished"><numerusform></numerusform></translation>
@@ -1116,18 +1509,10 @@ Disable safe saves and try again?</source>
         <translation>จำที่ฉันเลือก</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>ลบกลุ่ม?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>คุณต้องการจะลบกลุ่ม &quot;%1&quot; ไปตลอดกาลจริงหรือ?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>ไม่สามารถคำนวญกุญแมาสเตอร์ได้</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>ไม่มีฐานข้อมูลขณะนี้</translation>
     </message>
@@ -1161,10 +1546,6 @@ Do you want to merge your changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation type="unfinished"/>
     </message>
@@ -1172,88 +1553,103 @@ Do you want to merge your changes?</source>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>สร้างโทเคน TOTP</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>ปิด</translation>
+        <source>File opened in read only mode.</source>
+        <translation>เปิดแฟ้มแล้วในแบบอ่านอย่างเดียว</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>ทั่วไป</translation>
+        <source>Lock Database?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password</source>
-        <translation>รหัสผ่าน</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot; ถูกแก้ไข
+บันทึกการเปลี่ยนแปลง?</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>หมดอายุ</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Username</source>
-        <translation>ชื่อผู้ใช้</translation>
+        <source>Save changes?</source>
+        <translation>บันทึกความเปลี่ยนแปลง?</translation>
     </message>
     <message>
-        <source>Autotype</source>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>กำลังค้นหา</translation>
+        <source>Disable safe saves?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>คุณสมบัติ</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>แฟ้มแนบ</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>บันทึก</translation>
+        <source>Passwords</source>
+        <translation>รหัสผ่าน</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>หน้าต่าง</translation>
+        <source>Save database as</source>
+        <translation>บันทึกฐานข้อมูลเป็น</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>ลำดับ</translation>
+        <source>KeePass 2 Database</source>
+        <translation>ฐานข้อมูล KeePass 2</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>ค้นหา</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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></translation>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>ล้าง</translation>
+        <source>Delete group</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Never</source>
-        <translation>ไม่เลย</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[ถูกป้องกันอยู่]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>ปิดใช้</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>เปิดใช้</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1327,22 +1723,10 @@ Do you want to merge your changes?</source>
         <translation>คุณสมบัติใหม่</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>ยืนยันการนำออก</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[ถูกป้องกันอยู่]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>พรุ่งนี้</translation>
     </message>
@@ -1355,10 +1739,6 @@ Do you want to merge your changes?</source>
         <translation><numerusform>%n เดือน</numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 ปี</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation type="unfinished"/>
     </message>
@@ -1370,6 +1750,26 @@ Do you want to merge your changes?</source>
         <source>Entry updated successfully.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1615,6 +2015,81 @@ Do you want to merge your changes?</source>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>รหัสผ่าน:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1672,10 +2147,6 @@ Do you want to merge your changes?</source>
         <translation>ไม่สามารถดึง favicon ได้</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Images</source>
         <translation>ภาพ</translation>
     </message>
@@ -1684,14 +2155,6 @@ Do you want to merge your changes?</source>
         <translation>ทุกแฟ้ม</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>เลือกภาพ</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read icon</source>
-        <translation>ไม่สามารถอ่านไอคอน</translation>
-    </message>
-    <message>
         <source>Custom icon already exists</source>
         <translation>มีไอคอนที่กำหนดเองอยู่แล้ว</translation>
     </message>
@@ -1700,9 +2163,37 @@ Do you want to merge your changes?</source>
         <translation>ยืนยันการลบ</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
+        <source>Custom icon successfully downloaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
         <translation type="unfinished"/>
     </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform></translation>
+    </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>
@@ -1751,9 +2242,8 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation> - โคลน</translation>
+        <source>%1 - Clone</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1798,10 +2288,6 @@ This may cause the affected plugins to malfunction.</source>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>ยืนยันการนำออก</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>บันทึกแฟ้มแนบ</translation>
     </message>
@@ -1837,10 +2323,13 @@ This may cause the affected plugins to malfunction.</source>
 %1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>ไม่สามารถเปิดแฟ้ม:
-%1</translation>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1924,108 +2413,166 @@ This may cause the affected plugins to malfunction.</source>
         <source>Attachments</source>
         <translation>แฟ้มแนบ</translation>
     </message>
-</context>
-<context>
-    <name>EntryView</name>
     <message>
-        <source>Customize View</source>
+        <source>Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide Usernames</source>
+        <source>TOTP</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
     <message>
-        <source>Hide Passwords</source>
-        <translation type="unfinished"/>
+        <source>Generate TOTP Token</source>
+        <translation>สร้างโทเคน TOTP</translation>
     </message>
     <message>
-        <source>Fit to window</source>
-        <translation type="unfinished"/>
+        <source>Close</source>
+        <translation>ปิด</translation>
     </message>
     <message>
-        <source>Fit to contents</source>
-        <translation type="unfinished"/>
+        <source>General</source>
+        <translation>ทั่วไป</translation>
     </message>
     <message>
-        <source>Reset to defaults</source>
+        <source>Username</source>
+        <translation>ชื่อผู้ใช้</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>รหัสผ่าน</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>หมดอายุ</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>คุณสมบัติ</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>แฟ้มแนบ</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>บันทึก</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Attachments (icon)</source>
+        <source>Window</source>
+        <translation>หน้าต่าง</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>ลำดับ</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>กำลังค้นหา</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>ค้นหา</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>ล้าง</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>ไม่เลย</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[ถูกป้องกันอยู่]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Group</name>
     <message>
-        <source>Recycle Bin</source>
-        <translation>ถังขยะ</translation>
+        <source>Enabled</source>
+        <translation>เปิดใช้</translation>
     </message>
-</context>
-<context>
-    <name>HostInstaller</name>
     <message>
-        <source>KeePassXC: Cannot save file!</source>
-        <translation>KeePassXC: ไม่สามารถบันทึกแฟ้ม!</translation>
+        <source>Disabled</source>
+        <translation>ปิดใช้</translation>
     </message>
     <message>
-        <source>Cannot save the native messaging script file.</source>
+        <source>Share</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>ความยาว:</translation>
-    </message>
+    <name>EntryView</name>
     <message>
-        <source>Character Types</source>
-        <translation>ชนิดอักขระ</translation>
+        <source>Customize View</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Upper Case Letters</source>
-        <translation>อักษรตัวพิมพ์ใหญ่</translation>
+        <source>Hide Usernames</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
+        <source>Hide Passwords</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lower Case Letters</source>
-        <translation>อักษรตัวพิมพ์เล็ก</translation>
+        <source>Fit to window</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
+        <source>Fit to contents</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Numbers</source>
-        <translation>ตัวเลข</translation>
+        <source>Reset to defaults</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
+        <source>Attachments (icon)</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Group</name>
     <message>
-        <source>Special Characters</source>
-        <translation>อักขระพิเศษ</translation>
+        <source>Recycle Bin</source>
+        <translation>ถังขยะ</translation>
     </message>
     <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>GroupModel</name>
     <message>
-        <source>Exclude look-alike characters</source>
-        <translation>ไม่ใช้อักขระที่หน้าตาคล้ายกัน</translation>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>HostInstaller</name>
     <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>ทำให้แน่ใจว่ารหัสผ่านมีอักขระจากทุกกลุ่ม</translation>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation>KeePassXC: ไม่สามารถบันทึกแฟ้ม!</translation>
     </message>
     <message>
-        <source>Extended ASCII</source>
+        <source>Cannot save the native messaging script file.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -2054,6 +2601,26 @@ This may cause the affected plugins to malfunction.</source>
         <source>Wrong key or database file is corrupt.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2213,10 +2780,6 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation type="unfinished"/>
     </message>
@@ -2267,6 +2830,18 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Unsupported KeePass 2 database version.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2339,10 +2914,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation type="unfinished"/>
     </message>
@@ -2391,6 +2962,12 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2554,58 +3131,144 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Invalid entry field type</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <source>Disabled share</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <source>Import from</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
+        <source>Export to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
+        <source>Synchronize with</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - ข้อผิดพลาด</translation>
+        <source>Key Component</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>ยกเลิก</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>KeyFileEditWidget</name>
     <message>
-        <source>&amp;Database</source>
-        <translation>ฐานข้อมูล (&amp;D)</translation>
+        <source>Browse</source>
+        <translation>ดู</translation>
     </message>
     <message>
-        <source>&amp;Recent databases</source>
-        <translation>ฐานข้อมูลที่เพิ่งใช้ (&amp;R)</translation>
+        <source>Generate</source>
+        <translation>สร้าง</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>นำเข้า</translation>
+        <source>Key File</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Help</source>
-        <translation>ช่วยเหลือ (&amp;H)</translation>
+        <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"/>
     </message>
     <message>
-        <source>E&amp;ntries</source>
+        <source>Legacy key file format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Time-based one-time password</source>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>แฟ้มกุญแจ</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>ทุกแฟ้ม</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>สร้างแฟ้มกุญแจ...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>เลือกแฟ้มกุญแจ</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>ฐานข้อมูล (&amp;D)</translation>
+    </message>
+    <message>
+        <source>&amp;Recent databases</source>
+        <translation>ฐานข้อมูลที่เพิ่งใช้ (&amp;R)</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>ช่วยเหลือ (&amp;H)</translation>
+    </message>
+    <message>
+        <source>E&amp;ntries</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2637,30 +3300,10 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>ปิดฐานข้อมูล (&amp;C)</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>ฐานข้อมูลใหม่ (&amp;N)</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>ผสานจากฐานข้อมูล KeePassX</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>เพิ่มรายการใหม่ (&amp;A)</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>ดูและแก้ไขรายการ (&amp;V)</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>ลบรายการ (&amp;D)</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>เพิ่มกลุ่มใหม่ (&amp;A)</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>แก้ไขกลุ่ม (&amp;E)</translation>
     </message>
@@ -2673,14 +3316,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>บันทึกฐานข้อมูลเป็น (&amp;V)...</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>เปลี่ยนกุญแจมาสเตอร์ (&amp;M)</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>การตั้งค่าฐานข้อมูล (&amp;D)</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>การตั้งค่าฐานข้อมูล</translation>
     </message>
@@ -2689,10 +3324,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>โคลนรายการ (&amp;C)</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>ค้นหา (&amp;F)</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>คัดลอกชื่อผู้ใช้ (&amp;U)</translation>
     </message>
@@ -2701,10 +3332,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>คัดลอกชื่อผู้ใช้ไปคลิปบอร์ด</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>คัดลอกรหัสผ่าน (&amp;Y)</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>คัดลอกรหัสผ่านไปคลิปบอร์ด</translation>
     </message>
@@ -2717,14 +3344,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>ตัวสร้างรหัสผ่าน</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>เปิด URL (&amp;O)</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>ล็อกฐานข้อมูล (&amp;L)</translation>
     </message>
@@ -2757,22 +3376,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>ส่งออกไปเป็นแฟ้ม CSV... (&amp;E)</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>นำเข้าฐานข้อมูล KeePass1...</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>นำเข้าแฟ้ม CSV...</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>ซ่อมฐานข้อมูล... (&amp;P)</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>แสดง TOTP</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>ติดตั้ง TOTP...</translation>
     </message>
@@ -2793,14 +3396,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>มีข้อผิดพลาดในการเข้าถึงแฟ้มตั้งค่า %1</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>อ่านอย่างเดียว</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>ตั้งค่า</translation>
     </message>
@@ -2813,253 +3408,404 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>ออกจาก KeePassXC</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>ฐานข้อมูล KeePass 2</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>กรุณาแตะปุ่มบน YubiKey ของคุณ!</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>ทุกแฟ้ม</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>เปิดฐานข้อมูล</translation>
+        <source>&amp;Donate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>บันทึกฐานข้อมูลที่ซ่อมแล้ว</translation>
+        <source>Report a &amp;bug</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>การเขียนฐานข้อมูลล้มเหลว</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>กรุณาแตะปุ่มบน YubiKey ของคุณ!</translation>
+        <source>&amp;Import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
+        <source>Copy att&amp;ribute...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>OpenSSHKey</name>
+    <name>Merger</name>
     <message>
-        <source>Invalid key file, expecting an OpenSSH key</source>
+        <source>Creating missing %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>PEM boundary mismatch</source>
+        <source>Relocating %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Base64 decoding failed</source>
+        <source>Overwriting %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key file way too small.</source>
+        <source>older entry merged from database &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key file magic header id invalid</source>
+        <source>Adding backup for older target %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Found zero keys</source>
+        <source>Adding backup for older source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to read public key.</source>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Corrupted key file, reading private key failed</source>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>No private key payload to decrypt</source>
+        <source>Synchronizing from newer source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Trying to run KDF without cipher</source>
+        <source>Synchronizing from older source %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase is required to decrypt this key</source>
+        <source>Deleting child %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key derivation failed, key file corrupted?</source>
+        <source>Deleting orphan %1 [%2]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Decryption failed, wrong passphrase?</source>
+        <source>Changed deleted objects</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unexpected EOF while reading public key</source>
+        <source>Adding missing icon %1</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
     <message>
-        <source>Unexpected EOF while reading private key</source>
+        <source>Create a new KeePassXC database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t write public key as it is empty</source>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>รูต</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unexpected EOF when writing public key</source>
+        <source>En&amp;cryption Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t write private key as it is empty</source>
+        <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"/>
     </message>
     <message>
-        <source>Unexpected EOF when writing private key</source>
+        <source>Advanced Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported key type: %1</source>
+        <source>Simple Settings</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
     <message>
-        <source>Unknown cipher: %1</source>
+        <source>Encryption Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cipher IV is too short for MD5 kdf</source>
+        <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"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
     <message>
-        <source>Unknown KDF: %1</source>
+        <source>Database Master Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unknown key type: %1</source>
+        <source>A master key known only to you protects your database.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>NewDatabaseWizardPageMetaData</name>
     <message>
-        <source>Dialog</source>
+        <source>General Database Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
+        <source>Please fill in the display name and an optional description for your new database:</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Enable KeePassHTTP server</source>
+        <source>Invalid key file, expecting an OpenSSH key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>ทั่วไป</translation>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <source>Base64 decoding failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <source>Key file way too small.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return only best matching entries</source>
+        <source>Key file magic header id invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <source>Found zero keys</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
+        <source>Failed to read public key.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Match URL schemes</source>
+        <source>Corrupted key file, reading private key failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
+        <source>No private key payload to decrypt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
+        <source>Trying to run KDF without cipher</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
+        <source>Passphrase is required to decrypt this key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <source>Key derivation failed, key file corrupted?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>ตัวสร้างรหัสผ่าน</translation>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>ขั้นสูง</translation>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
+        <source>Unexpected EOF while reading private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
+        <source>Can&apos;t write public key as it is empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only the selected database has to be connected with a client.</source>
+        <source>Unexpected EOF when writing public key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <source>Can&apos;t write private key as it is empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
+        <source>Unexpected EOF when writing private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <source>Unsupported key type: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>พอร์ต HTTP:</translation>
+        <source>Unknown cipher: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>พอร์ตมาตรฐาน: 19455</translation>
+        <source>Cipher IV is too short for MD5 kdf</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <source>Unknown KDF: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <source>Unknown key type: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PasswordEditWidget</name>
+    <message>
+        <source>Enter password:</source>
+        <translation>ป้อนรหัสผ่าน:</translation>
+    </message>
+    <message>
+        <source>Confirm password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>รหัสผ่าน</translation>
+    </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"/>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <source>Password cannot be empty.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
+        <source>Passwords do not match.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
+        <source>Generate master password</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -3131,18 +3877,10 @@ Using default port 19455.</source>
         <translation>รายการคำ:</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>จำนวนคำ:</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>ตัวแบ่งคำ:</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>สร้าง</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>คัดลอก</translation>
     </message>
@@ -3155,10 +3893,6 @@ Using default port 19455.</source>
         <translation>ปิด</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>ใช้</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>เอนโทรปี: %1 บิต</translation>
     </message>
@@ -3186,52 +3920,201 @@ Using default port 19455.</source>
         <comment>Password quality</comment>
         <translation>ดีมาก</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>ขั้นสูง</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>QObject</name>
+    <name>QApplication</name>
     <message>
-        <source>Database not opened</source>
+        <source>KeeShare</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>QFileDialog</name>
     <message>
-        <source>Database hash not available</source>
+        <source>Select</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>QMessageBox</name>
     <message>
-        <source>Client public key not received</source>
+        <source>Overwrite</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot decrypt message</source>
+        <source>Delete</source>
+        <translation>ลบ</translation>
+    </message>
+    <message>
+        <source>Move</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
+        <source>Empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Action cancelled or denied</source>
+        <source>Remove</source>
+        <translation>นำออก</translation>
+    </message>
+    <message>
+        <source>Skip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <source>Disable</source>
+        <translation>ปิดใช้</translation>
+    </message>
+    <message>
+        <source>Merge</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>KeePassXC association failed, try again</source>
+        <source>Database not opened</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key change was not successful</source>
-        <translation>การเปลี่ยนกุญแจไม่สำเร็จ</translation>
+        <source>Database hash not available</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Encryption key is not recognized</source>
-        <translation>ไม่รู้จักกุญแจเข้ารหัสลับ</translation>
+        <source>Client public key not received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot decrypt message</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>No saved databases found</source>
-        <translation>ไม่มีฐานข้อมูลที่ถูกบันทึกอยู่</translation>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation>ไม่รู้จักกุญแจเข้ารหัสลับ</translation>
     </message>
     <message>
         <source>Incorrect action</source>
@@ -3359,10 +4242,6 @@ Using default port 19455.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3441,12 +4320,6 @@ Available commands:
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>แฟ้มว่างเปล่า!
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation>รูปแบบสตริงไม่ถูกต้อง</translation>
     </message>
@@ -3455,6 +4328,371 @@ Available commands:
         <translation>ไม่มีเครื่องหมายคำพูดปิด</translation>
     </message>
     <message>
+        <source>Group</source>
+        <translation>กลุ่ม</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>หัวเรื่อง</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>ชื่อผู้ใช้</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>รหัสผ่าน</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>บันทึก</translation>
+    </message>
+    <message>
+        <source>Last Modified</source>
+        <translation>แก้ไขล่าสุด</translation>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation>สร้าง</translation>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation>การทำงานร่วมกับเบราว์เซอร์</translation>
+    </message>
+    <message>
+        <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Press</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new random diceware passphrase.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word count for the diceware passphrase.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wordlist for the diceware generator.
+[Default: EFF English]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new random password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>AES: 256-bit</source>
         <translation>AES: 256 บิต</translation>
     </message>
@@ -3479,100 +4717,113 @@ Available commands:
         <translation>AES-KDF (KDBX 3.1)</translation>
     </message>
     <message>
-        <source>Group</source>
-        <translation>กลุ่ม</translation>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Title</source>
-        <translation>หัวเรื่อง</translation>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Username</source>
-        <translation>ชื่อผู้ใช้</translation>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password</source>
-        <translation>รหัสผ่าน</translation>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>บันทึก</translation>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Last Modified</source>
-        <translation>แก้ไขล่าสุด</translation>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Created</source>
-        <translation>สร้าง</translation>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
+        <source>No key is set. Aborting database creation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Browser Integration</source>
-        <translation>การทำงานร่วมกับเบราว์เซอร์</translation>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
+        <source>Successfully created new database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Press</source>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passive</source>
+        <source>Creating KeyFile %1 failed: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>SSH Agent</source>
+        <source>Loading KeyFile %1 failed: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Generate a new random diceware passphrase.</source>
+        <source>Remove an entry from the database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word count for the diceware passphrase.</source>
+        <source>Path of the entry to remove.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>count</source>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist for the diceware generator.
-[Default: EFF English]</source>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Generate a new random password.</source>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - แอปจัดการรหัสผ่านข้ามแพลตฟอร์ม</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Length of the generated password.</source>
+        <source>path to a custom config file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
+        <source>key file of the database</source>
+        <translation>แฟ้มกุญแจสำหรับฐานข้อมูลดังกล่าว</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
+        <source>Parent window handle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
+        <source>Another instance of KeePassXC is already running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
+        <source>Fatal error while testing the cryptographic functions.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - ข้อผิดพลาด</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -3611,324 +4862,416 @@ Available commands:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
     <message>
-        <source>Search...</source>
-        <translation>ค้นหา...</translation>
+        <source>Agent connection failed.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Search</source>
-        <translation>ค้นหา</translation>
+        <source>Agent protocol error.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>ล้าง</translation>
+        <source>No agent running, cannot add identity.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation>คำนึงถึงอักษรตัวใหญ่เล็ก</translation>
+        <source>No agent running, cannot remove identity.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Limit search to selected group</source>
-        <translation>จำกัดการค้นไว้เฉพาะในกลุ่มที่เลือก</translation>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Service</name>
     <message>
-        <source>KeePassXC: New key association request</source>
+        <source>The key has already been added.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: เขียนทับกุญแจที่มีอยู่เดิม?</translation>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
+        <source>Search Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: ปรับปรุงรายการ</translation>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
+        <source>Every search term must match (ie, logical AND)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: ฐานข้อมูลล็อกอยู่!</translation>
+        <source>Modifiers</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
+        <source>exclude term from results</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: เอากุญแจออกจากฐานข้อมูล</translation>
+        <source>match term exactly</source>
+        <translation type="unfinished"/>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation type="unfinished"><numerusform></numerusform></translation>
+    <message>
+        <source>use regex in term</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: ไม่พบกุญแจ</translation>
+        <source>Fields</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <source>Term Wildcards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: ไม่มีการตั้งค่าที่ใช้ได้!</translation>
+        <source>match anything</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <source>match one</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
+        <source>logical OR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>หยุด</translation>
+        <source>Examples</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SearchWidget</name>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: การอนุญาตถูกนำออก</translation>
+        <source>Search</source>
+        <translation>ค้นหา</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation type="unfinished"><numerusform></numerusform></translation>
+    <message>
+        <source>Clear</source>
+        <translation>ล้าง</translation>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
+        <source>Limit search to selected group</source>
+        <translation>จำกัดการค้นไว้เฉพาะในกลุ่มที่เลือก</translation>
+    </message>
+    <message>
+        <source>Search Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Case sensitive</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SettingsWidget</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>Application Settings</source>
-        <translation>การตั้งค่าแอป</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>ทั่วไป</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>ความมั่นคง</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>มีข้อผิดพลาดในการเข้าถึงแฟ้มตั้งค่า %1</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>การตั้งค่าพื้นฐาน</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
+        <source>Certificate:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>จำฐานข้อมูลล่าสุด</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
+        <source>Key:</source>
+        <translation>กุญแจ:</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>สร้าง</translation>
+    </message>
+    <message>
+        <source>Import</source>
+        <translation>นำเข้า</translation>
+    </message>
+    <message>
+        <source>Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
+        <source>Imported certificates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>บันทึกอัตโนมัติตอนออก</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>บันทึกอัตโนมัติทุกครั้งที่มีการเปลี่ยนแปลง</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically reload the database when modified externally</source>
+        <source>Untrust</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>ย่อหน้าต่างเมื่อคัดลอกไปยังคลิปบอร์ด</translation>
+        <source>Remove</source>
+        <translation>นำออก</translation>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>ย่อหน้าต่างลงเล็กสุดตอนเริ่มแอป</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
+        <source>Status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <source>Fingerprint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
-        <translation>ซ่อนมุมมองละเอียด</translation>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>แสดงไอคอนสำหรับ system tray</translation>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
+        <source>Untrusted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
-        <translation>ซ่อนหน้าต่างไว้ที่ system tray แทนการออกจากแอป</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>ภาษา</translation>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Auto-Type</translation>
+        <source>All files</source>
+        <translation>ทุกแฟ้ม</translation>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
+        <source>Select path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
+        <source>Exporting changed certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
+        <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"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>การหน่วง Auto-Type</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation>มิลลิวิ</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
+        <source>Import from container with certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <source>Not this time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
+        <source>Never</source>
+        <translation>ไม่เลย</translation>
+    </message>
+    <message>
+        <source>Always</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
+        <source>Just this time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>ทั่วไป</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
+        <source>Import from %1 successful (%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>ล้างคลิปบอร์ดหลัง</translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>วิ</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>ล็อกฐานข้อมูลหลังไม่มีการใช้งาน</translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>ความสะดวก</translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
+        <source>Untrusted import prevented</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>ล็อกฐานข้อมูลหลังย่อหน้าต่างลงเล็กสุด</translation>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>ไม่ต้องถามรหัสผ่านซ้ำถ้ามองเห็นรหัสผ่านอยู่</translation>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>แสดงรหัสผ่านอย่างเปิดเผยโดยปริยาย</translation>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
+        <source>Successful unsigned import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide entry notes by default</source>
+        <source>File does not exist</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>ความเป็นส่วนตัว</translation>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>ใช้กูเกิลเป็นวิธีสำรองเพื่อดาวน์โหลดไอคอนเว็บไซต์</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpDialog</name>
+    <message>
+        <source>Timed Password</source>
+        <translation>รหัสผ่านกำหนดเวลา</translation>
+    </message>
+    <message>
+        <source>000000</source>
+        <translation>000000</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>คัดลอก</translation>
+    </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
+    <message>
+        <source>Copy</source>
+        <translation>คัดลอก</translation>
+    </message>
+    <message>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>There was an error creating the QR code.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Closing in %1 seconds.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation>ติดตั้ง TOTP</translation>
@@ -3950,59 +5293,84 @@ Please unlock the selected database or choose another one which is unlocked.</so
         <translation>ใช้การตั้งค่าที่กำหนดเอง</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>หมายเหตุ: เปลี่ยนแปลงการตั้งค่าเหล่านี้ก็ต่อเมื่อคุณรู้ว่าคุณกำลังทำอะไรอยู่</translation>
+        <source>Custom Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Time step:</source>
         <translation>ขั้นเวลา:</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8 หลัก</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>วิ</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>ขนาดรหัส:</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6 หลัก</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>ขนาดรหัส:</translation>
+        <source>7 digits</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>วิ</translation>
+        <source>8 digits</source>
+        <translation>8 หลัก</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>รหัสผ่านกำหนดเวลา</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>คัดลอก</translation>
+        <source>Close</source>
+        <translation>ปิด</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>หมดอายุใน</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>วินาที</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>ปลดล็อกฐานข้อมูล</translation>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4037,41 +5405,25 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
 </context>
 <context>
-    <name>main</name>
-    <message>
-        <source>Remove an entry from the database.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation type="unfinished"/>
-    </message>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>Path of the entry to remove.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - แอปจัดการรหัสผ่านข้ามแพลตฟอร์ม</translation>
+        <source>Refresh</source>
+        <translation>เรียกใหม่</translation>
     </message>
     <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
+        <source>YubiKey Challenge-Response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>path to a custom config file</source>
+        <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"/>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>แฟ้มกุญแจสำหรับฐานข้อมูลดังกล่าว</translation>
-    </message>
-    <message>
-        <source>read password of the database from stdin</source>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Parent window handle</source>
+        <source>No YubiKey inserted.</source>
         <translation type="unfinished"/>
     </message>
 </context>
diff --git a/share/translations/keepassx_tr.ts b/share/translations/keepassx_tr.ts
index ac8603c9b..9137b7495 100644
--- a/share/translations/keepassx_tr.ts
+++ b/share/translations/keepassx_tr.ts
@@ -38,12 +38,6 @@
         <translation>Panoya kopyala</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>Sürüm %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>Düzeltme: %1</translation>
     </message>
@@ -76,35 +70,48 @@ MİB mimarisi: %2
         <translation>KeePassXC ekibinden özel teşekkürler, özgün KeePassX&apos;i yaptığı için debfx&apos;e gider.</translation>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
-        <translation>Yapı Tarzı: %1
-</translation>
+        <source>Version %1</source>
+        <translation>Sürüm %1</translation>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP Erişim Onayı</translation>
+        <source>Build Type: %1</source>
+        <translation>Yapı: %1</translation>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>Bu kararı anımsa</translation>
+        <source>Auto-Type</source>
+        <translation>Oto-Yazım</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>İzin ver</translation>
+        <source>Browser Integration</source>
+        <translation>Tarayıcı Birleştirmesi</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>Reddet</translation>
+        <source>SSH Agent</source>
+        <translation>SSH Ajanı</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>%1, şu öge(ler) için parolalara erişim izni istedi.
-Lütfen erişime izin vermek istediklerinizi seçin.</translation>
+        <source>YubiKey</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Yok</translation>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -113,6 +120,277 @@ Lütfen erişime izin vermek istediklerinizi seçin.</translation>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>SSH Aracısı&apos;nı etkinleştir (yeniden başlatma gerektirir)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Uygulama Ayarları</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Genel</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Güvenlik</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>%1 yapılandırma dosyası için erişim hatası</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Temel Ayarlar</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>Başlangıç</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Yalnızca tek KeePassXC oluşumu başlat</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Geçmiş veritabanlarını hatırla</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Son anahtar dosyalarını ve güvenlik aygıtlarını anımsa</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Başlangıçta önceki veritabanları yükle</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>Uygulama başlangıcında pencereyi simge durumuna küçült</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>Dosya Yönetimi</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation>Veritabanı dosyalarını güvenli bir şekilde kaydet (Dropbox, vb. ile uyumsuz olabilir)</translation>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation>Kaydetmeden önce veritabanı dosyasını yedekle</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Her değişiklik sonrası kendiliğinden kaydet</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Çıkışta kendiliğinden kaydet</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Veri dışındaki değişiklikler için veritabanını değiştirilmiş olarak işaretleme (ör., genişleyen gruplar)</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Harici olarak değiştirildiğinde veritabanını otomatik olarak yeniden yükle</translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>Girdi Yönetimi</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>Girdi oluşturmada küme simgesini kullan</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Panoya kopyalarken simge durumuna küçült</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation>Ayrıntılar görünümünü gizle</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Genel</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation>Araç çubuğunu gizle (simge)</translation>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation>Çıkmak yerine simge durumunda küçült</translation>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Sistem tepsisi simgesi göster</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>Koyu sistem tepsisi simgesi</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Simge durumuna küçültüldüğünde pencereyi sistem tepsisine gizle</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Dil</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Oto-Yazım</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>Küresel Oto-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>Küresel Oto-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>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Küresel Oto-Yazım kısayolu</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation>Oto-Yazım gecikmesi</translation>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation>ms</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation>Oto-Yazım başlama gecikmesi</translation>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>Zaman Aşımları</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>Sonrasında panoyu temizle</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>san</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>Etkinliğini kaybettikten sonra veritabanlarını kilitle</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>Elverişlilik</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Oturum kilitlendiğinde veya kapak kapandığında veritabanlarını kilitle</translation>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>Pencereyi küçülttükten sonra veritabanlarını kilitle</translation>
+    </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>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>Parola görünür olduğunda yineleme gerektirme</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation>Önizleme panelindeki şifreleri gizle</translation>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>Girdi notlarını öntanımlı olarak gizle</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>Gizlilik</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation>Web site simgelerini indirmek için DuckDuckGo&apos;yu yedek olarak kullan</translation>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -216,6 +494,26 @@ Lütfen erişime izin vermek istediklerinizi seçin.</translation>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation>KeePassXC-Tarayıcı Girdiyi Kaydet</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Tamam</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>İptal</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -289,14 +587,6 @@ Lütfen erişime izin vermek istediklerinizi seçin.</translation>
         <translation>Eşleşen kimlik bilgilerini &amp;kullanıcı adına göre sırala</translation>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>&amp;Tüm tarayıcıları kapatın</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>Tüm hatırlanan izinleri &amp;unut</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>Gelişmiş</translation>
     </message>
@@ -362,14 +652,6 @@ Lütfen erişime izin vermek istediklerinizi seçin.</translation>
         <translation>&lt;b&gt;Uyarı:&lt;/b&gt; Aşağıdaki seçenekler tehlikeli olabilir!</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>Yürütülebilir Dosyalar (*.exe);;Tüm Dosyalar (*.*)</translation>
-    </message>
-    <message>
-        <source>Executable Files (*)</source>
-        <translation>Yürütülebilir Dosyalar (*)</translation>
-    </message>
-    <message>
         <source>Select custom proxy location</source>
         <translation>Özel proxy konumunu seçin</translation>
     </message>
@@ -377,6 +659,31 @@ Lütfen erişime izin vermek istediklerinizi seçin.</translation>
         <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
         <translation>Üzgünüz, ancak şu anda Snap yayınları için KeePassXC-Tarayıcı desteklenmiyor.</translation>
     </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation>KeePassXC-Tarayıcı tarayıcı entegrasyonunun çalışması için gereklidir. &lt;br /&gt; Şunları indirin %1 ve %2.</translation>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation>&amp;Tor Tarayıcı</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: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation>Yürütülebilir Dosyalar</translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation>Tüm Dosyalar</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"/>
+    </message>
 </context>
 <context>
     <name>BrowserService</name>
@@ -417,153 +724,43 @@ Do you want to overwrite it?</source>
         <translation>%1 -%2 bilgilerini güncellemek istiyor musun?</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Veri tabanı kilitli!</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Etkin veri tabanı kilitli!
-Lütfen seçilen veri tabanının kilidini kaldırın veya kilitli olmayan birini seçin.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Ayarlar kullanılabilir değil!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation>Aktif veritabanı ayar girdisi içermiyor.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Anahtar bulunamadı</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation>KeePassXC ayarlarında paylaşılan şifreleme anahtarı bulunamadı.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Anahtarlar veri tabanından kaldırıldı</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation><numerusform>%n şifreleme anahtarı KeePassXC ayarlarından başarıyla kaldırıldı.</numerusform><numerusform>%n şifreleme anahtarı KeePassXC ayarlarından başarıyla kaldırıldı.</numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>Depolanmış izinler kaldırılıyor…</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>İptal</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Silinen yetkiler</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation><numerusform>%n girdiden izinler başarıyla kaldırıldı.</numerusform><numerusform>%n girdiden izinler başarıyla kaldırıldı.</numerusform></translation>
+        <source>Converting attributes to custom data…</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: İzinli girdi bulunamadı!</translation>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Etkin veri tabanı izinleri olan girdi barındırmıyor.</translation>
-    </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>Parola</translation>
-    </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>Parolayı gir:</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>Parolayı yinele:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;Anahtar dosyası</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>Gözat</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Oluştur</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>Karşılaştırma &amp;Yanıtı</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Yenile</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>Anahtar dosyaları</translation>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation type="unfinished"/>
     </message>
-    <message>
-        <source>All files</source>
-        <translation>Tüm dosyalar</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>Anahtar Dosyası Oluştur...</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>Anahtar Dosyası oluşturulamıyor :</translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>Bir anahtar dosyası seç</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Boş parola</translation>
-    </message>
-    <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>Parola olarak boş bir dizgeyi kullanmak istediğinize emin misiniz?</translation>
-    </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>Farklı parolalar sağlandı.</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>%1, Anahtar dosyası olarak belirlenemedi:
-%2</translation>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Legacy key file format</source>
-        <translation>Eski anahtar dosya biçimi</translation>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation type="unfinished"/>
     </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>İleride desteklenmeyebilecek eski bir anahtar 
-dosya biçimi kullanıyorsunuz. 
-
-Lütfen yeni bir anahtar dosyası oluşturmayı düşünün.</translation>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>Ana anahtar değiştirme başarısız: YubiKey yerleştirilmedi.</translation>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -644,14 +841,6 @@ Lütfen yeni bir anahtar dosyası oluşturmayı düşünün.</translation>
         <translation>CSV içerisinde mevcut değil</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>Boş alan adı</translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>kolon</translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>CSV dosyasından içe aktarıldı</translation>
     </message>
@@ -660,48 +849,84 @@ Lütfen yeni bir anahtar dosyası oluşturmayı düşünün.</translation>
         <translation>Özgün veri:</translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>CSV dosyasında hata(lar) saptandı !</translation>
+        <source>Error</source>
+        <translation>Hata</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation> daha fazla ileti atlandı]</translation>
+        <source>Empty fieldname %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Hata</translation>
+        <source>column %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>CSV içe aktarma: yazıcıda hatalar:
-</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>Hata</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Ana anahtar hesaplanamıyor</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
-        <translation><numerusform>%n bayt, </numerusform><numerusform>%n bayt, </numerusform></translation>
+        <source>%n column(s)</source>
+        <translation><numerusform>%n sütun</numerusform><numerusform>%n sütun</numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
-        <translation><numerusform>%n satır, </numerusform><numerusform>%n satır, </numerusform></translation>
+        <source>%n byte(s)</source>
+        <translation><numerusform>%n bayt, </numerusform><numerusform>%n bayt, </numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
-        <translation><numerusform>%n sütun</numerusform><numerusform>%n sütun</numerusform></translation>
+        <source>%n row(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Kök</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -731,14 +956,6 @@ Lütfen yeni bir anahtar dosyası oluşturmayı düşünün.</translation>
         <translation>Karşılaştırma Yanıtı:</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Veri tabanı açılamıyor.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Anahtar dosya açılamıyor</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation>Eski anahtar dosya biçimi</translation>
     </message>
@@ -768,105 +985,168 @@ Lütfen yeni bir anahtar dosyası oluşturmayı düşünün.</translation>
         <source>Select key file</source>
         <translation>Anahtar dosyası seç</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>Veri tabanını onar</translation>
+        <source>TouchID for quick unlock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Hata</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Anahtar dosya açılamıyor</translation>
+        <source>Can't open key file:
+%1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Veri tabanı açılamıyor.</translation>
+        <source>Passwords</source>
+        <translation>Şifreler</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Gelişmiş Ayarlar</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Genel</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Veri tabanı açıldı. Yapılacak bir şey yok.</translation>
+        <source>Security</source>
+        <translation>Güvenlik</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>Başarılı</translation>
+        <source>Master Key</source>
+        <translation>Ana Anahtar</translation>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>Veri tabanı başarıyla onarıldı
-Artık kaydedebilirsiniz.</translation>
+        <source>Encryption Settings</source>
+        <translation>Şifreleme Ayarları</translation>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>Veri tabanı onarılamıyor.</translation>
+        <source>Browser Integration</source>
+        <translation>Tarayıcı Birleştirmesi</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>Genel</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation>KeePassXC-Tarayıcı ayarları</translation>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>Şifreleme</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>&amp;Tüm tarayıcıları kapatın</translation>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Tur sayısı çok yüksek</translation>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation type="unfinished"/>
     </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>Argon2 ile çok yüksek sayıda anahtar dönüştürme turu kullanıyorsunuz.
-
-Eğer bu sayı ile devam ederseniz, veritabanınızın açılması saatler veya günler (hatta daha uzun) sürebilir!</translation>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Understood, keep number</source>
-        <translation>Anladım, sayı kalsın</translation>
+        <source>Stored keys</source>
+        <translation>Saklanan anahtarlar</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>İptal</translation>
+        <source>Remove</source>
+        <translation>Kaldır</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Tur sayısı çok düşük</translation>
+        <source>Delete the selected key?</source>
+        <translation>Seçili anahtarı silmek istiyor musun?</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>AES-KDF ile çok düşük sayıda anahtar dönüştürme turu kullanıyorsunuz.
-
-Eğer bu sayı ile devam ederseniz, veritabanınız çok kolay çözülerek kırılabilir!</translation>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KDF unchanged</source>
-        <translation>KDF değişmedi</translation>
+        <source>Key</source>
+        <translation>Anahtar</translation>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
-        <translation>Yeni KDF parametreleri ile anahtar dönüştürülemedi; KDF değişmedi.</translation>
+        <source>Value</source>
+        <translation>Değer</translation>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation>Tüm tarayıcıları kapatın</translation>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Anahtar bulunamadı</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Anahtarlar veritabanından kaldırıldı</translation>
     </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
-        <translation><numerusform> MiB</numerusform><numerusform> MiB</numerusform></translation>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Depolanmış izinler kaldırılıyor…</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>İptal</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Kaldırılan izinler</translation>
     </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
-        <translation><numerusform>iş parçacığı</numerusform><numerusform>iş parçacığı</numerusform></translation>
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: İzinli girdi bulunamadı!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Etkin veritabanı izinleri olan bir girdi içermiyor.</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
     </message>
 </context>
 <context>
@@ -903,6 +1183,113 @@ Eğer bu sayı ile devam ederseniz, veritabanınız çok kolay çözülerek kır
         <source>Parallelism:</source>
         <translation>Paralellik:</translation>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation>Veritabanı biçimi:</translation>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation>KDBX 4.0 (önerilen)</translation>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation>KDBX 3.1</translation>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Tur sayısı çok yüksek</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>Argon2 ile çok yüksek sayıda anahtar dönüştürme turu kullanıyorsunuz.
+
+Eğer bu sayı ile devam ederseniz, veritabanınızın açılması saatler veya günler (hatta daha uzun) sürebilir!</translation>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation>Anladım, sayı kalsın</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>İptal</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Tur sayısı çok düşük</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>AES-KDF ile çok düşük sayıda anahtar dönüştürme turu kullanıyorsunuz.
+
+Eğer bu sayı ile devam ederseniz, veritabanınız çok kolay çözülerek kırılabilir!</translation>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation>KDF değişmedi</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation>Yeni KDF parametreleri ile anahtar dönüştürülemedi; KDF değişmedi.</translation>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation><numerusform>MB</numerusform><numerusform>MB</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -952,91 +1339,110 @@ Eğer bu sayı ile devam ederseniz, veritabanınız çok kolay çözülerek kır
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>Kök</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 Veri Tabanı</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Tüm dosyalar</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Veri tabanı aç</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>Dosya bulunamadı!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Veri tabanı açılamıyor.</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>Dosya salt okunur kipte açıldı.</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
+    <message>
+        <source>Add additional protection...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open CSV file</source>
-        <translation>CSV dosyası aç</translation>
+        <source>No encryption key added</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>CSV dosyası</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>Tüm dosyalar (*)</translation>
+        <source>No password set</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Veri tabanı birleştir</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 type="unfinished"/>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>KeePass 1 veri tabanı aç</translation>
+        <source>Unknown error</source>
+        <translation>Bilinmeyen hata</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1 veri tabanı</translation>
+        <source>Failed to change master key</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>Close?</source>
-        <translation>Kapat?</translation>
+        <source>Database Name:</source>
+        <translation>Veritabanı Adı:</translation>
     </message>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot;, düzenleme kipinde.
-Değişikliklerden vazgeç ve her durumda kapat?</translation>
+        <source>Description:</source>
+        <translation>Açıklama:</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>Save changes?</source>
-        <translation>Değişiklikleri kaydet?</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 Veri Tabanı</translation>
     </message>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>&quot;%1&quot; değiştirildi.
-Değişiklikleri kaydet?</translation>
+        <source>All files</source>
+        <translation>Tüm dosyalar</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Veri tabanına yazma başarısız.</translation>
+        <source>Open database</source>
+        <translation>Veri tabanı aç</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Parolalar</translation>
+        <source>CSV file</source>
+        <translation>CSV dosyası</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Veri tabanını farklı kaydet</translation>
+        <source>Merge database</source>
+        <translation>Veri tabanı birleştir</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>KeePass 1 veri tabanı aç</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 veri tabanı</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1047,40 +1453,40 @@ Değişiklikleri kaydet?</translation>
         <translation>CSV dosyasına yazma başarısız.</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>Yeni veri tabanı</translation>
+        <source>Database creation error</source>
+        <translation>Veritabanı oluşturma hatası</translation>
     </message>
     <message>
-        <source>locked</source>
-        <translation>kilitli</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 type="unfinished"/>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>Veri tabanını kilitle</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>Şu anda düzenlediğiniz için veri tabanı kilitlenemez.
-Lütfen değişikliklerinizi bitirmek için iptale basın veya onlardan vazgeçin.</translation>
+        <source>Select CSV file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>Veri tabanı değiştirildi.
-Kilitlemeden önce veri tabanını kaydetmek ister misiniz?
-Aksi halde değişiklikleriniz kaybolacak.</translation>
+        <source>New Database</source>
+        <translation>Yeni Veritabanı</translation>
     </message>
     <message>
-        <source>Disable safe saves?</source>
-        <translation>Güvenli kaydetme devre-dışı?</translation>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [Yeni Veritabanı]</translation>
     </message>
     <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 veritabanını birkaç kez kaydetmeyi başaramadı. Buna genellikle bir kayıt dosyası üzerinde kilit tutan dosya eşitleme hizmetleri neden olur.
-Güvenli kaydetme devre dışı bırakılsın ve tekrar denensin mi?</translation>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1090,37 +1496,13 @@ Güvenli kaydetme devre dışı bırakılsın ve tekrar denensin mi?</translatio
         <translation>Aranıyor...</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>Ana anahtarı değiştir</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>Girdiyi sil?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>&quot;%1&quot; girdisini tümüyle silmek istediğinize emin misiniz?</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Girdileri sil?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>%1 girdiyi tümüyle silmek istediğinize emin misiniz?</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Girdiyi geri dönüşüm kutusuna taşı?</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation>&quot;%1&quot; girdisini geri dönüşüm kutusuna taşımak istediğinize emin misiniz?</translation>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Girdileri geri dönüşüm kutusuna taşı?</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation><numerusform>%n girdiyi geri dönüşüm kutusuna taşımak istediğinize emin misiniz?</numerusform><numerusform>%n girdiyi geri dönüşüm kutusuna taşımak istediğinize emin misiniz?</numerusform></translation>
@@ -1138,18 +1520,10 @@ Güvenli kaydetme devre dışı bırakılsın ve tekrar denensin mi?</translatio
         <translation>Seçimimi anımsa</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Kümeyi sil?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>&quot;%1&quot; kümesini tümüyle silmek istediğinize emin misiniz?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Ana anahtar hesaplanamıyor</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>Geçerli veri tabanı yok.</translation>
     </message>
@@ -1184,10 +1558,6 @@ Do you want to merge your changes?</source>
 Değişikliklerinizi birleştirmek ister misiniz?</translation>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>Bu veri tabanını kendiliğinden yeniden yüklenirken yeni veri tabanı dosyası açılamadı.</translation>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>Geri dönüşüm kutusunu boşalt?</translation>
     </message>
@@ -1195,88 +1565,104 @@ Değişikliklerinizi birleştirmek ister misiniz?</translation>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>Geri dönüşüm kutunuzdaki her şeyi kalıcı olarak silmek istediğinize emin misiniz?</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>TOTP Jetonu Oluştur</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Kapat</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Dosya salt okunur modda açıldı.</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Genel</translation>
+        <source>Lock Database?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Parola</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot; değiştirildi.
+Değişiklikler kaydedilsin mi?</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>Geçerlilik</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Kullanıcı adı</translation>
+        <source>Save changes?</source>
+        <translation>Değişiklikleri kaydet?</translation>
     </message>
     <message>
-        <source>Autotype</source>
-        <translation>Oto-yazım</translation>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>Aranıyor</translation>
+        <source>Disable safe saves?</source>
+        <translation>Güvenli kaydetme devre dışı?</translation>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>Öznitelikler</translation>
+        <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 veritabanını birkaç kez kaydetmeyi başaramadı. Buna genellikle bir kayıt dosyası üzerinde kilit tutan dosya eşitleme hizmetleri neden olur.
+Güvenli kaydetme devre dışı bırakılsın ve tekrar denensin mi?</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Ekler</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Notlar</translation>
+        <source>Passwords</source>
+        <translation>Şifreler</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>Pencere</translation>
+        <source>Save database as</source>
+        <translation>Veritabanını farklı kaydet</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>Sıra</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 Veritabanı</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Ara</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Temizle</translation>
+        <source>Delete group</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Never</source>
-        <translation>Asla</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[KORUMALI]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>Devre dışı</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Etkin</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1350,22 +1736,10 @@ Değişikliklerinizi birleştirmek ister misiniz?</translation>
         <translation>Yeni öznitelik</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Kaldırmayı Onayla</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>Bu özniteliği silmek istediğinizden emin misiniz?</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[KORUMALI]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation>Görüntüleme veya düzenlemeyi belirlemek için basın</translation>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>Yarın</translation>
     </message>
@@ -1378,10 +1752,6 @@ Değişikliklerinizi birleştirmek ister misiniz?</translation>
         <translation><numerusform>%n ay</numerusform><numerusform>%n ay</numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 yıl</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation>Oluşturulan parolayı uygula?</translation>
     </message>
@@ -1393,6 +1763,26 @@ Değişikliklerinizi birleştirmek ister misiniz?</translation>
         <source>Entry updated successfully.</source>
         <translation>Girdi güncelleme başarılı.</translation>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation>[KORUMALI] Görmek veya düzenlemek için göstere bas</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1638,6 +2028,81 @@ Değişikliklerinizi birleştirmek ister misiniz?</translation>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Şifre:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1695,10 +2160,6 @@ Değişikliklerinizi birleştirmek ister misiniz?</translation>
         <translation>Simge alınamadı.</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>İpucu: Araçlar&gt;Ayarlar&gt;Güvenlik altından Google&apos;ı yedek olarak etkinleştirebilirsiniz</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>Resimler</translation>
     </message>
@@ -1707,14 +2168,6 @@ Değişikliklerinizi birleştirmek ister misiniz?</translation>
         <translation>Tüm dosyalar</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Resim Seç</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read icon</source>
-        <translation>Simge okunamadı</translation>
-    </message>
-    <message>
         <source>Custom icon already exists</source>
         <translation>Özel simge zaten var</translation>
     </message>
@@ -1723,8 +2176,36 @@ Değişikliklerinizi birleştirmek ister misiniz?</translation>
         <translation>Silmeyi Onayla</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>Bu simge %1 girdi tarafından kullanılıyor ve öntanımlı simge tarafından değiştirilecek. Silmek istediğinize emin misiniz?</translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1776,9 +2257,8 @@ Bu etkilenen eklentilerin bozulmasına neden olabilir.</translation>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation>- Klon</translation>
+        <source>%1 - Clone</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1823,10 +2303,6 @@ Bu etkilenen eklentilerin bozulmasına neden olabilir.</translation>
         <translation><numerusform>%n eki kaldırmak istediğinize emin misiniz?</numerusform><numerusform>%n eki kaldırmak istediğinize emin misiniz?</numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Kaldırmayı Onayla</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>Ekleri kaydet</translation>
     </message>
@@ -1863,10 +2339,13 @@ Bu etkilenen eklentilerin bozulmasına neden olabilir.</translation>
 %1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>Açılamayan dosyalar:
-%1</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1950,6 +2429,106 @@ Bu etkilenen eklentilerin bozulmasına neden olabilir.</translation>
         <source>Attachments</source>
         <translation>Ekler</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>Evet</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>TOTP Jetonu Oluştur</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Kapat</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Genel</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Kullanıcı adı</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Şifre</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Geçerlilik</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>Öznitelikler</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Dosya ekleri</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notlar</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Oto-yazım</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Pencere</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Sıra</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Aranıyor</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Ara</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Temizle</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Asla</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[KORUMALI]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Etkin</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Devre dışı</translation>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EntryView</name>
@@ -1988,6 +2567,19 @@ Bu etkilenen eklentilerin bozulmasına neden olabilir.</translation>
         <source>Recycle Bin</source>
         <translation>Geri Dönüşüm Kutusu</translation>
     </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>HostInstaller</name>
@@ -2001,61 +2593,6 @@ Bu etkilenen eklentilerin bozulmasına neden olabilir.</translation>
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>Uzunluk:</translation>
-    </message>
-    <message>
-        <source>Character Types</source>
-        <translation>Karakter Türleri</translation>
-    </message>
-    <message>
-        <source>Upper Case Letters</source>
-        <translation>Büyük Harfler</translation>
-    </message>
-    <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
-    </message>
-    <message>
-        <source>Lower Case Letters</source>
-        <translation>Küçük Harfler</translation>
-    </message>
-    <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
-    </message>
-    <message>
-        <source>Numbers</source>
-        <translation>Rakamlar</translation>
-    </message>
-    <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
-    </message>
-    <message>
-        <source>Special Characters</source>
-        <translation>Özel Karakterler</translation>
-    </message>
-    <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
-    </message>
-    <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Benzer karakterleri dışla</translation>
-    </message>
-    <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>Parolanın her kümeden karakter içerdiğine emin ol</translation>
-    </message>
-    <message>
-        <source>Extended ASCII</source>
-        <translation>Genişletilmiş ASCII</translation>
-    </message>
-</context>
-<context>
     <name>KMessageWidget</name>
     <message>
         <source>&amp;Close</source>
@@ -2080,6 +2617,26 @@ Bu etkilenen eklentilerin bozulmasına neden olabilir.</translation>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Yanlış anahtar veya veri tabanı dosyası bozuk.</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation>eksik veritabanı başlıkları</translation>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>Geçersiz başlık kimliği boyutu</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>Geçersiz başlık alanı genişliği</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>Geçersiz başlık veri genişliği</translation>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2239,10 +2796,6 @@ Bu etkilenen eklentilerin bozulmasına neden olabilir.</translation>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation>Geçersiz şifre uuid uzunluğu</translation>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation>Desteklenmeyen şifreleme</translation>
     </message>
@@ -2296,6 +2849,18 @@ Bu tek yönlü bir yer değiştirmedir. İçe aktarılan veri tabanını eski Ke
         <source>Unsupported KeePass 2 database version.</source>
         <translation>Desteklenmeyen KeePass 2 veri tabanı sürümü.</translation>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2369,10 +2934,6 @@ Evrensel benzersiz tanımlayıcı &quot;uuid&quot; girdisi bulunamadı</translat
         <translation>Farklı evrensel benzersiz tanımlayıcı &quot;uuid&quot; ile geçmiş öğesi</translation>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation>Giriş dizesi çözülemiyor</translation>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation>Yinelenen özel öznitelik bulundu</translation>
     </message>
@@ -2421,6 +2982,12 @@ Evrensel benzersiz tanımlayıcı &quot;uuid&quot; girdisi bulunamadı</translat
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation>İkili dosya sıkıştırmasını açma başarısız</translation>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2584,28 +3151,126 @@ Evrensel benzersiz tanımlayıcı &quot;uuid&quot; girdisi bulunamadı</translat
         <source>Invalid entry field type</source>
         <translation>Geçersiz girdi alanı tipi</translation>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>Var olan tekil oluşum kilit dosyası geçersiz. Yeni oluşum başlatılıyor.</translation>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>Kilit dosyası oluşturulamadı. Tekil oluşum kipi devre dışı bırakıldı.</translation>
+        <source>Import from</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Başka bir KeePassXC oluşumu zaten çalışıyor.</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Kriptografik işlevler sınanırken ölümcül hata.</translation>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Hata</translation>
+        <source>Key Component</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>İptal</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>Gözat</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Oluştur</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation>Eski anahtar dosya biçimi</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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Anahtar dosyaları</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Bütün dosyalar</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Anahtar Dosyası Oluştur...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Bir anahtar dosyası seç</translation>
     </message>
 </context>
 <context>
@@ -2619,10 +3284,6 @@ Evrensel benzersiz tanımlayıcı &quot;uuid&quot; girdisi bulunamadı</translat
         <translation>&amp;Son veri tabanları</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>İçe aktar</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation>&amp;Yardım</translation>
     </message>
@@ -2631,14 +3292,6 @@ Evrensel benzersiz tanımlayıcı &quot;uuid&quot; girdisi bulunamadı</translat
         <translation>G&amp;irdiler</translation>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>Öznite&amp;liği panoya kopyala</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation>Zamana dayalı tek kullanımlık şifre</translation>
-    </message>
-    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Kümeler</translation>
     </message>
@@ -2667,30 +3320,10 @@ Evrensel benzersiz tanımlayıcı &quot;uuid&quot; girdisi bulunamadı</translat
         <translation>Veri tabanını &amp;kapat</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>&amp;Yeni veri tabanı</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>KeePassX veri tabanından birleştir</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>Yeni girdi &amp;ekle</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>Girdiyi &amp;göster/düzenle</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>Girdiyi &amp;sil</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>Yeni küme &amp;ekle</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>Kümeyi &amp;düzenle</translation>
     </message>
@@ -2703,14 +3336,6 @@ Evrensel benzersiz tanımlayıcı &quot;uuid&quot; girdisi bulunamadı</translat
         <translation>Veri tabanını farklı ka&amp;ydet...</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Ana anahtarı değiştir...</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>&amp;Veri tabanı ayarları</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>Veri tabnı ayarları</translation>
     </message>
@@ -2719,10 +3344,6 @@ Evrensel benzersiz tanımlayıcı &quot;uuid&quot; girdisi bulunamadı</translat
         <translation>Girdiyi &amp;klonla</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>&amp;Bul</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>&amp;Kullanıcı adını kopyala</translation>
     </message>
@@ -2731,10 +3352,6 @@ Evrensel benzersiz tanımlayıcı &quot;uuid&quot; girdisi bulunamadı</translat
         <translation>Kullanıcı adını panoya kopyala</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>Parolayı kop&amp;yala</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>Parolayı panoya kopyala</translation>
     </message>
@@ -2747,14 +3364,6 @@ Evrensel benzersiz tanımlayıcı &quot;uuid&quot; girdisi bulunamadı</translat
         <translation>Parola Oluşturucu</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation>Oto-Yazım &amp;gerçekleştir</translation>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>URL&apos;yi &amp;aç</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>Veri tabanlarını &amp;kilitle</translation>
     </message>
@@ -2787,22 +3396,6 @@ Evrensel benzersiz tanımlayıcı &quot;uuid&quot; girdisi bulunamadı</translat
         <translation>&amp;CSV dosyasına aktar...</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>KeePass 1 veri tabanını içe aktar</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>CSV dosyasını içe aktar...</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Veri tabanını onar...</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>ZTSP&apos;yi göster</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>TOTP kurulumu yap...</translation>
     </message>
@@ -2823,14 +3416,6 @@ Evrensel benzersiz tanımlayıcı &quot;uuid&quot; girdisi bulunamadı</translat
         <translation>%1 yapılandırma dosyası için erişim hatası</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Görünüşe göre KeePassHTTP&apos;yi tarayıcı tümleşmesi için kullanıyorsunuz. Bu özellik terk edilmiştir ve gelecekte kaldırılacaktır.&lt;br&gt;Bunun yerine KeePassXC-Browser&apos;a geçin! Göçle ilgili yardım için &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;göç kılavuzumuzu&lt;/a&gt; ziyaret edin (uyarı %1 / 3).&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>salt okunur</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Ayarlar</translation>
     </message>
@@ -2843,36 +3428,278 @@ Evrensel benzersiz tanımlayıcı &quot;uuid&quot; girdisi bulunamadı</translat
         <translation>KeePassXC&apos;den Çık</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 Veri Tabanı</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Lütfen YubiKey&apos;inizdeki düğmeye dokunun!</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Tüm dosyalar</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation>UYARI: KeePassXC&apos;nin kararsız inşasını kullanıyorsunuz!
+Yüksek bozulma tehlikesi bulunmaktadır, veri tabanlarınızın yedeğini alın.
+Bu sürüm, üretimde kullanıma uygun değildir.</translation>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Veri tabanı aç</translation>
+        <source>&amp;Donate</source>
+        <translation>Bağış</translation>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Onarılan veri tabanını kaydet</translation>
+        <source>Report a &amp;bug</source>
+        <translation>Hata raporla</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Veri tabanına yazma başarısız.</translation>
+        <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>Uyarı: Qt sürümünüz Keepassxc&apos;nin ekran klavyesiyle çökmesine neden olabilir! 
+Keepassxc indirme sayfasında mevcut Appımage kullanmanızı öneririz.</translation>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Lütfen YubiKey&apos;inizdeki düğmeye dokunun!</translation>
+        <source>&amp;Import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
-        <translation>UYARI: KeePassXC&apos;nin kararsız inşasını kullanıyorsunuz!
-Yüksek bozulma tehlikesi bulunmaktadır, veri tabanlarınızın yedeğini alın.
-Bu sürüm, üretimde kullanıma uygun değildir.</translation>
+        <source>Copy att&amp;ribute...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation>URL&apos;yi &amp;Aç</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation>KeePass 1 veritabanı...</translation>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation>KeePass 1 veritabanını içe aktar</translation>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation>CSV dosyası...</translation>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation>CSV dosyasını içe aktar</translation>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Kök</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Gelişmiş Ayarlar</translation>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation>Temel Ayarlar</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <translation>Şifreleme Ayarları</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 type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation>Veritabanı Ana Anahtar</translation>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <translation>Genel Veritabanı Bilgileri</translation>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2975,125 +3802,34 @@ Bu sürüm, üretimde kullanıma uygun değildir.</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation>Diyalog</translation>
-    </message>
-    <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>Bu, ChromeIPass veya PassIFox&apos;tan veri tabanlarınıza erişirken gereklidir</translation>
-    </message>
-    <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>KeePassHTTP sunucusunu etkinleştir</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Genel</translation>
-    </message>
-    <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>Kimlik bilgisi istendiğinde bildirim g&amp;öster</translation>
-    </message>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>Tüm alan adı için tüm girdilerin yerine belirli bir URL için yalnızca en iyi eşleşmeyi döndürür.</translation>
-    </message>
-    <message>
-        <source>&amp;Return only best matching entries</source>
-        <translation>Yalnızca en iyi eşleşen girdileri &amp;döndür</translation>
-    </message>
-    <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Eğer kilitliyse veri tabanını açmayı is&amp;te</translation>
-    </message>
-    <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation>Yalnızca aynı şemalı girdiler (http://, https://, ftp://, ...) döndürülür.</translation>
-    </message>
-    <message>
-        <source>&amp;Match URL schemes</source>
-        <translation>URL şemalarını &amp;eşle</translation>
-    </message>
-    <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Eşleşen girdileri &amp;kullanıcı adına göre sırala</translation>
-    </message>
-    <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>&amp;Eşleşen girdileri başlığa göre sırala</translation>
-    </message>
-    <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>Paylaşılan tüm anahtarları etkin veri tabanından ka&amp;ldır</translation>
-    </message>
-    <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>Saklanan tüm izinleri etkin veri tabanındaki girdilerden kal&amp;dır</translation>
-    </message>
-    <message>
-        <source>Password Generator</source>
-        <translation>Parola Oluşturucu</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Gelişmiş</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Her zaman girdilere &amp;erişime izin ver</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Her zaman girdileri g&amp;üncellemeye izin ver</translation>
-    </message>
-    <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>Yalnızca seçilen veri tabanı istemciyle bağlanmış olmalıdır.</translation>
-    </message>
-    <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Eşleşen girdiler için tüm açık veri tabanlarını a&amp;ra</translation>
-    </message>
-    <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>Dizge alanlarını kendiliğinden oluşturma ve güncelleme desteklenmiyor.</translation>
-    </message>
-    <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>&quot;KPH: &quot; ile başlayan gelişmiş dizge alanları &amp;döndür</translation>
-    </message>
-    <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP Bağlantı noktası:</translation>
+        <source>Enter password:</source>
+        <translation>Şifre gir:</translation>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Öntanımlı bağlantı noktası: 19455</translation>
+        <source>Confirm password:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC, 127.0.0.1 üzerinde bu bağlantı noktasını dinleyecek.</translation>
+        <source>Password</source>
+        <translation>Şifre</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;Uyarı:&lt;/b&gt; Aşağıdaki seçenekler tehlikeli olabilir!</translation>
+        <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"/>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;KeePassHTTP terk edilmiştir ve gelecekte kaldırılacaktır.&lt;br&gt;Bunun yerine KeePassXC-Browser&apos;a geçin! Göçle ilgili yardım için &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;göç kılavuzumuzu&lt;/a&gt; ziyaret edin.&lt;/p&gt;</translation>
+        <source>Password cannot be empty.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Ayrıcalıklı bağlantı noktalarına bağlanılamıyor</translation>
+        <source>Passwords do not match.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>1024&apos;ün altındaki ayrıcalıklı bağlantı noktalarına bağlanamaz!
-Öntanımlı bağlantı noktası olan 19455 kullanılıyor.</translation>
+        <source>Generate master password</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3164,18 +3900,10 @@ Using default port 19455.</source>
         <translation>Sözcük listesi:</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Sözcük Sayısı:</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>Sözcük Ayırıcı:</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>Oluştur</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Kopyala</translation>
     </message>
@@ -3188,10 +3916,6 @@ Using default port 19455.</source>
         <translation>Kapat</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>Uygula</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>Entropi: %1 bit</translation>
     </message>
@@ -3219,6 +3943,171 @@ Using default port 19455.</source>
         <comment>Password quality</comment>
         <translation>Harika</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Gelişmiş</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation>{[(</translation>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation>.,:;</translation>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation>Tırnak</translation>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation>&quot; &apos;</translation>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation>&lt;*+!?=</translation>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation>\_|-/</translation>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation>#$%&amp;&amp;@^`~</translation>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation>Dışlanan karakterler: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</translation>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Sil</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Kaldır</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Devre dışı</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3239,34 +4128,18 @@ Using default port 19455.</source>
         <translation>İletinin şifresi çözülemedi</translation>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
-        <translation>Zaman aşımı veya KeePassXC&apos;ye bağlanılamadı</translation>
-    </message>
-    <message>
         <source>Action cancelled or denied</source>
         <translation>Eylem iptal edildi veya reddedildi</translation>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation>İleti şifrelenemedi veya genel anahtar bulunamadı. KeePassXC&apos;de Yerel Mesajlaşma etkin mi?</translation>
-    </message>
-    <message>
         <source>KeePassXC association failed, try again</source>
         <translation>KeePassXC ilişkilendirmesi başarısız, yeniden dene</translation>
     </message>
     <message>
-        <source>Key change was not successful</source>
-        <translation>Anahtar değişimi başarılı değil</translation>
-    </message>
-    <message>
         <source>Encryption key is not recognized</source>
         <translation>Şifreleme anahtarı tanınmadı</translation>
     </message>
     <message>
-        <source>No saved databases found</source>
-        <translation>Kaydedilmiş veri tabanı bulunamadı</translation>
-    </message>
-    <message>
         <source>Incorrect action</source>
         <translation>Doğru olmayan eylem</translation>
     </message>
@@ -3392,10 +4265,6 @@ Using default port 19455.</source>
         <translation>%1 kilidini kaldırmak için parola yerleştir: </translation>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation>%1 anahtar dosyası yüklenemedi : %2</translation>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3480,12 +4349,6 @@ Kullanılabilir komutlar:
         <translation>aygıttan okurken hata</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>dosya boş !
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation>kusurlu dizge</translation>
     </message>
@@ -3494,30 +4357,6 @@ Kullanılabilir komutlar:
         <translation>kapanış tırnak işareti eksik</translation>
     </message>
     <message>
-        <source>AES: 256-bit</source>
-        <translation>AES: 256-bit</translation>
-    </message>
-    <message>
-        <source>Twofish: 256-bit</source>
-        <translation>Twofish: 256-bit</translation>
-    </message>
-    <message>
-        <source>ChaCha20: 256-bit</source>
-        <translation>ChaCha20: 256-bit</translation>
-    </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – önerilen)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 4)</source>
-        <translation>AES-KDF (KDBX 4)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 3.1)</source>
-        <translation>AES-KDF (KDBX 3.1)</translation>
-    </message>
-    <message>
         <source>Group</source>
         <translation>Küme</translation>
     </message>
@@ -3546,10 +4385,6 @@ Kullanılabilir komutlar:
         <translation>Oluşturuldu</translation>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
-        <translation>Eski Tarayıcı birleşmesi</translation>
-    </message>
-    <message>
         <source>Browser Integration</source>
         <translation>Tarayıcı Tümleşmesi</translation>
     </message>
@@ -3578,10 +4413,6 @@ Kullanılabilir komutlar:
         <translation>Diceware parolası için kelime sayısı.</translation>
     </message>
     <message>
-        <source>count</source>
-        <translation>sayım</translation>
-    </message>
-    <message>
         <source>Wordlist for the diceware generator.
 [Default: EFF English]</source>
         <translation>Diceware oluşturucu için Kelime Listesi.
@@ -3592,28 +4423,438 @@ Kullanılabilir komutlar:
         <translation>Yeni bir karışık şifre oluştur.</translation>
     </message>
     <message>
-        <source>Length of the generated password.</source>
-        <translation>Oluşturulan şifrenin uzunluğu.</translation>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
-        <translation>Oluşturulan şifrede küçük karakterler kullan.</translation>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
-        <translation>Oluşturulan şifrede büyük karakterler kullan.</translation>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
-        <translation>Oluşturulan şifrede rakamlar kullan.</translation>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
-        <translation>Oluşturulan şifrede özel karakterler kullan.</translation>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
-        <translation>Oluşturulan şifrede genişletilmiş ASCII kullan.</translation>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation>Pano temizlendi!</translation>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation>sayım</translation>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation>Girdi için yeni şifre girin: </translation>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256-bit</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256-bit</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256-bit</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – önerilen)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>Veritabanından bir girdi kaldır.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>Kaldırılacak girdinin yolu.</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>Var olan tekil oluşum kilit dosyası geçersiz. Yeni oluşum başlatılıyor.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Kilit dosyası oluşturulamadı. Tekil oluşum kipi devre dışı bırakıldı.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - çapraz platformlu parola yöneticisi</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>açılacak şifre veritabanlarının dosya adları (*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>özel yapılandırma dosyası yolu</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>veritabanı&apos;nın anahtar dosyası</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>veritabanının şifresini stdin&apos;den oku</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation>Ana pencere işlemesi</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Başka bir KeePassXC oluşumu zaten çalışıyor.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Kriptografik işlevler sınanırken ölümcül hata.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Hata</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation>Veritabanı şifresi:</translation>
     </message>
 </context>
 <context>
@@ -3651,12 +4892,98 @@ Kullanılabilir komutlar:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
+    <message>
+        <source>Agent connection failed.</source>
+        <translation>İstemci bağlantısı başarısız.</translation>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation>İstemci protokol hatası.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation>Çalışan istemci yok, kimlik ekleyemezsiniz.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation>Çalışan istemci yok, kimlik silemezsiniz.</translation>
+    </message>
     <message>
-        <source>Search...</source>
-        <translation>Ara...</translation>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation>İstemci bu kimliği reddetti. Olası nedenler şunlardır:</translation>
     </message>
     <message>
+        <source>The key has already been added.</source>
+        <translation>Anahtar zaten eklendi.</translation>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation>Kısıtlı süre istemci tarafından desteklenmez (seçenekleri kontrol edin).</translation>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation>Onay isteği istemci tarafından desteklenmiyor (seçenekleri kontrol edin).</translation>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
         <source>Search</source>
         <translation>Ara</translation>
     </message>
@@ -3665,317 +4992,319 @@ Kullanılabilir komutlar:
         <translation>Temizle</translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Büyük Küçük Harfe Duyarlı</translation>
-    </message>
-    <message>
         <source>Limit search to selected group</source>
         <translation>Aramayı seçilen kümeye sınırla</translation>
     </message>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Service</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC: Yeni anahtar ilişkilendirme isteği</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation>Yukarıdaki anahtar için ilişkilendirme isteği aldınız.
-Eğer KeePassXC veri tabanınıza erişmesine izin vermek isterseniz
-tanımlamak için ona eşsiz bir ad verin ve kabul edin.</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: Var olan anahtarın üstüne yaz?</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>&quot;%1&quot; adlı bir paylaşılan şifreleme anahtarı zaten var.
-Üzerine yazmak ister misiniz?</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: Girdi Güncelle</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>%1 -%2 bilgilerini güncellemek istiyor musun?</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Veri tabanı kilitli!</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Etkin veri tabanı kilitli!
-Lütfen seçilen veri tabanının kilidini kaldırın veya kilitli olmayan birini seçin.</translation>
+        <source>Key:</source>
+        <translation>Anahtar:</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Anahtarlar veri tabanından kaldırıldı</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation><numerusform>%n şifreleme anahtarı KeePassX/Http ayarlarından başarıyla kaldırıldı.</numerusform><numerusform>%n şifreleme anahtarları KeePassX/Http ayarlarından başarıyla kaldırıldı.</numerusform></translation>
+        <source>Generate</source>
+        <translation>Oluştur</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Anahtar bulunamadı</translation>
+        <source>Import</source>
+        <translation>İçe aktar</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>KeePassHttp Ayarlarında paylaşılan şifreleme anahtarı bulunamadı.</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Ayarlar kullanılabilir değil!</translation>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>Etkin veri tabanı KeePassHttp Ayarlarının girdisini barındırmıyor.</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>Saklanan izinler kaldırılıyor...</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>İptal</translation>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Silinen yetkiler</translation>
+        <source>Remove</source>
+        <translation>Kaldır</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation><numerusform>%n girdiden izinler başarıyla kaldırıldı.</numerusform><numerusform>%n girişlerden izinler başarıyla kaldırıldı.</numerusform></translation>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: İzinli girdi bulunamadı!</translation>
+        <source>Status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Etkin veri tabanı izinleri olan girdi barındırmıyor.</translation>
+        <source>Fingerprint</source>
+        <translation>Parmak izi</translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
-        <translation>Uygulama Ayarları</translation>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Genel</translation>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>Güvenlik</translation>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>%1 yapılandırma dosyası için erişim hatası</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>Temel Ayarlar</translation>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Yalnızca tek KeePassXC oluşumu başlat</translation>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>Son veri tabanlarını anımsa</translation>
+        <source>All files</source>
+        <translation>Bütün dosyalar</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Son anahtar dosyalarını ve güvenlik aygıtlarını anımsa</translation>
+        <source>Select path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Başlangıçta önceki veri tabanlarını yükle</translation>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>Çıkışta kendiliğinden kaydet</translation>
+        <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"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>Her değişiklik sonrası kendiliğinden kaydet</translation>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Veri tabanı dışarıdan değiştirildiğinde kendiliğinden yeniden yükle</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>Panoya kopyalarken simge durumuna küçült</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Uygulama başlangıcında pencereyi simge durumuna küçült</translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>Girdi oluşturmada küme simgesini kullan</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Veri dışı değişiklikler (kümeleri genişletmek gibi) için veri tabanını değiştirildi olarak imleme</translation>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
-        <translation>Ayrıntılar görünümünü gizle</translation>
+        <source>Never</source>
+        <translation>Asla</translation>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>Sistem tepsisi simgesi göster</translation>
+        <source>Always</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>Simge durumuna küçültüldüğünde pencereyi sistem tepsisine gizle</translation>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
-        <translation>Uygulamadan çıkmak yerine pencereyi sistem tepsisine gizle</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
-        <translation>Koyu sistem tepsisi simgesi</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Dil</translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Oto-Yazım</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>Küresel Oto-Yazım için pencereleri karşılaştırmada giriş başlığını kullan</translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>Küresel Oto-Yazım için pencereleri karşılaştırmada girdi URL&apos;sini kullan</translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation>Oto-Yazım gerçekleştirmeden önce her zaman sor</translation>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Küresel Oto-Yazım kısayolu</translation>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>Oto-Yazım gecikmesi</translation>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation>ms</translation>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
-        <translation>Başlangıç</translation>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
-        <translation>Dosya Yönetimi</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation>Veri tabanı dosyalarını güvenle kaydet (Dropbox vb. ile uyumsuz olabilir)</translation>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
-        <translation>Kaydetmeden önce veri tabanı dosyasını yedekle</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
-        <translation>Girdi Yönetimi</translation>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Genel</translation>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
-        <translation>Zaman Aşımları</translation>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>Şundan sonra panoyu temizle</translation>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>san</translation>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>Şu kadar hareketsizlikten sonra veri tabanlarını kilitle</translation>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Elverişlilik</translation>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Oturum kilitlendiğinde veya kapak kapandığında veri tabanlarını kilitle</translation>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>Pencereyi küçülttükten sonra veri tabanlarını kilitle</translation>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>TotpDialog</name>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>Parola görünür olduğunda yineleme gerektirme</translation>
+        <source>Timed Password</source>
+        <translation>Zamanlı Parola</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Parolaları öntanımlı olarak düz metinde göster</translation>
+        <source>000000</source>
+        <translation>000000</translation>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
-        <translation>Önizleme panelindeki şifreleri gizle</translation>
+        <source>Copy</source>
+        <translation>Kopyala</translation>
+    </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
     <message>
-        <source>Hide entry notes by default</source>
-        <translation>Girdi notlarını öntanımlı olarak gizle</translation>
+        <source>Copy</source>
+        <translation>Kopyala</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>Gizlilik</translation>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>Web site simgelerini indirmek için Google&apos;ı yedek olarak kullan</translation>
+        <source>There was an error creating the QR code.</source>
+        <translation type="unfinished"/>
     </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>
+        <source>Closing in %1 seconds.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
-        <translation>ZTSP&apos;yi kur</translation>
+        <translation>TOTP Kurulum</translation>
     </message>
     <message>
         <source>Key:</source>
@@ -3994,59 +5323,84 @@ Lütfen seçilen veri tabanının kilidini kaldırın veya kilitli olmayan birin
         <translation>Özel ayarlar kullan</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>Not: Bu ayarları yalnızca ne yaptığınızı biliyorsanız değiştirin.</translation>
+        <source>Custom Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Time step:</source>
         <translation>Zaman adımı:</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8 hane</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>san</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>Kod boyutu:</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6 hane</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>Kod boyutu:</translation>
+        <source>7 digits</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>san</translation>
+        <source>8 digits</source>
+        <translation>8 hane</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>Zamanlı Parola</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Kopyala</translation>
+        <source>Close</source>
+        <translation>Kapat</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>Süre bitimi</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>saniye</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>Veri tabanı kilidini kaldır</translation>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4081,42 +5435,26 @@ Lütfen seçilen veri tabanının kilidini kaldırın veya kilitli olmayan birin
     </message>
 </context>
 <context>
-    <name>main</name>
-    <message>
-        <source>Remove an entry from the database.</source>
-        <translation>Veri tabanından bir girdi kaldır.</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>Veri tabanının yolu.</translation>
-    </message>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>Path of the entry to remove.</source>
-        <translation>Kaldırılacak girdinin yolu.</translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - çapraz platformlu parola yöneticisi</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>açılacak parola veri tabanlarının dosya adları (*.kdbx)</translation>
+        <source>Refresh</source>
+        <translation>Yenile</translation>
     </message>
     <message>
-        <source>path to a custom config file</source>
-        <translation>özel yapılandırma dosyası yolu</translation>
+        <source>YubiKey Challenge-Response</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>veri tabanının anahtar dosyası</translation>
+        <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"/>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>veri tabanının parolasını stdin&apos;den oku</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Parent window handle</source>
-        <translation>Ana pencere işlemesi</translation>
+        <source>No YubiKey inserted.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_uk.ts b/share/translations/keepassx_uk.ts
index bc3b20d37..9321c7f7f 100644
--- a/share/translations/keepassx_uk.ts
+++ b/share/translations/keepassx_uk.ts
@@ -38,12 +38,6 @@
         <translation>Скопіювати в кишеню</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>Версія %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>Ревізія: %1</translation>
     </message>
@@ -76,35 +70,48 @@ Kernel: %3 %4</source>
         <translation>Команда KeePassXC щиро дякує debfx за створення первісної версії KeePassX.</translation>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
-        <translation>Тип збірки: %1
-</translation>
+        <source>Version %1</source>
+        <translation>Версія %1</translation>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>Схвалити доступ KeePassXC до HTTP</translation>
+        <source>Build Type: %1</source>
+        <translation>Тип збірки: %1</translation>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>Запам&apos;ятати цей вибір</translation>
+        <source>Auto-Type</source>
+        <translation>Автозаповнення</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Дозволити</translation>
+        <source>Browser Integration</source>
+        <translation>Сполучення з переглядачем</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>Заборонити</translation>
+        <source>SSH Agent</source>
+        <translation>Посередник SSH</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>%1 запитує доступ до паролів у таких записах.
-Дозволити доступ?</translation>
+        <source>YubiKey</source>
+        <translation>YubiKey</translation>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation>TouchID</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Відсутні</translation>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -113,6 +120,277 @@ Please select whether you want to allow access.</source>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>Увімкнути посередника SSH (вимагає перезапуск)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Налаштування застосунку</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Загальні</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Безпека</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Помилка доступу до файлу конфігурації %1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Базові налаштування</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>Запуск</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Запускати лише один примірник KeePassXC</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Пам’ятати останні сховища</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Пам&apos;ятати останні файли ключів і механізми захисту</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Завантажувати попереднє сховище під час запуску</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>Згортати вікно після запуску застосунку</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>Керування файлами</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation>Безпечно зберігати файли сховища (може бути несумісним з Dropbox та ін.)</translation>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation>Створювати резервну копію сховища перед збереженням</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Автоматично зберігати після кожної зміни</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Автоматично зберігати перед виходом</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Не помічати сховище зміненим після змін, що не стосуються даних (напр. розкриття груп)</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Автоматично перезавантажувати сховище після зовнішніх змін</translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>Керування записами</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>Використовувати для нових записів значок групи</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Згортати після копіювання до кишені</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation>Сховати панель передперегляду запису</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Загальні</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation>Сховати панель інструментів</translation>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation>Мінімізувати вікно замість закриття</translation>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Показувати значок у системному лотку</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>Темний значок у системному лотку</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Після згортання ховати вікно в системний лоток</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Мова</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Автозаповнення</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>Використовувати заголовок запису для знаходження відповідного вікна у глобальному автозаповненні</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>Використовувати URL запису для знаходження відповідного вікна у глобальному автозаповненні</translation>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>Завжди питати перед автозаповненням</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Глобальні сполучення клавіш для автозаповнення</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation>Затримка введення символів при автозаповненні</translation>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation> мс</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation>Затримка початку автозаповнення</translation>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>Час очікування</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>Очищати кишеню через</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> сек</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>Блокувати сховища, неактивні протягом</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation> хвилин</translation>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>Зручність</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Блокувати сховища після блокування сесії або закриття кришки пристрою</translation>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>Блокувати сховища після згортання вікна</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation>Блокувати попередньо заблоковане сховище після завершення автозаповнення</translation>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>Не запитувати підтвердження пароля, якщо він не прихований</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation>Не приховувати паролі під час їх редагування</translation>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation>Не показувати текст-заповнювач для порожніх полів паролів</translation>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation>Приховувати паролі у панелі передперегляду запису</translation>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>Типово приховувати нотатки до запису</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>Приватність</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation>Використовувати DuckDuckGo як запасний варіант при завантаженні значків веб-сторінок</translation>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -216,6 +494,27 @@ Please select whether you want to allow access.</source>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation>KeePassXC-Browser Збереження запису</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Гаразд</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Скасувати</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation>У вас відкрито декілька сховищ.
+Будь ласка, оберіть правильне сховище для збереження реєстраційних даних.</translation>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -289,14 +588,6 @@ Please select whether you want to allow access.</source>
         <translation>Сортувати збіжні реєстраційні дані за іменем користувача</translation>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>Від&apos;єднати від усіх переглядачів</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>Забути всі збережені дозволи</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>Розширені</translation>
     </message>
@@ -362,14 +653,6 @@ Please select whether you want to allow access.</source>
         <translation>&lt;b&gt;Попередження:&lt;/b&gt; ці параметри можуть бути небезпечними!</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>Виконавчі файли (*.exe);;Всі файли (*.*)</translation>
-    </message>
-    <message>
-        <source>Executable Files (*)</source>
-        <translation>Виконавчі файли (*)</translation>
-    </message>
-    <message>
         <source>Select custom proxy location</source>
         <translation>Вибрати власне розташування посередника</translation>
     </message>
@@ -377,6 +660,31 @@ Please select whether you want to allow access.</source>
         <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
         <translation>Вибачте, але KeePassXC-Переглядач поки що не працює у версіях Snap.</translation>
     </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation>Для роботи інтеграції з браузером необхідний KeePassXC-Browser. &lt;br /&gt;Завантажте його для %1 та %2.</translation>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation>Браузер &amp;Tor</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: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation>Виконувані файли</translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <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"/>
+    </message>
 </context>
 <context>
     <name>BrowserService</name>
@@ -417,153 +725,43 @@ Do you want to overwrite it?</source>
         <translation>Бажаєте оновити інформацію у %1 – %2?</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: сховище заблоковане!</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Чинне сховище заблоковане!
-Будь ласка, розблокуйте обране сховище або виберіть інше незаблоковане.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: налаштування недоступні!</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation>Поточне сховище не містить запису налаштувань.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: жодного ключа не знайдено</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation>Не знайдено спільних ключів шифрування у налаштуваннях KeePassXC.</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: ключі видалено зі сховища</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation><numerusform>Успішно видалено %n шифрувальний ключ з налаштувань KeePassXC.</numerusform><numerusform>Успішно видалено %n шифрувальних ключі з налаштувань KeePassXC.</numerusform><numerusform>Успішно видалено %n шифрувальних ключів з налаштувань KeePassXC.</numerusform><numerusform>Успішно видалено %n шифрувальних ключів з налаштувань KeePassXC.</numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>Видалення збережених привілеїв...</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>Скасувати</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: привілеї видалено</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation><numerusform>Успішно видалено привілеї для %n запису.</numerusform><numerusform>Успішно видалено привілеї для %n записів.</numerusform><numerusform>Успішно видалено привілеї для %n записів.</numerusform><numerusform>Успішно видалено привілеї для %n записів.</numerusform></translation>
+        <source>Converting attributes to custom data…</source>
+        <translation>Перетворення атрибутів користувацьких даних…</translation>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: запис з привілеями не знайдено!</translation>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation>KeePassXC: Атрибути KeePassHTTP перетворено</translation>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Поточне сховище не містить записів з привілеями.</translation>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>Пароль</translation>
-    </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>Введіть пароль:</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>Повторіть пароль:</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>Файл-&amp;ключ</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>Огляд</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Створити</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>Виклик-відповідь</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Оновити</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>Файли-ключі</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>Всі файли</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>Створити файл-ключ...</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>Неможливо створити файл-ключ: </translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>Обрати файл-ключ</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Порожній пароль</translation>
-    </message>
-    <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>Ви дійсно бажаєте використати порожній рядок як пароль?</translation>
-    </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>Паролі не співпадають.</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>Не вдалося встановити %1 як файл-ключ:
-%2</translation>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation>KeePassXC: Записів з атрибутами KeePassHTTP не знайдено!</translation>
     </message>
     <message>
-        <source>Legacy key file format</source>
-        <translation>Застарілий формат файла-ключа</translation>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation type="unfinished"/>
     </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>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>Спроба змінити головний ключ зазнала невдачі: YubiKey не вставлено.</translation>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -644,14 +842,6 @@ Please consider generating a new key file.</source>
         <translation>Відсутні у файлі CSV</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>Без назви </translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>колонка </translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>Імпортовано з файлу CSV</translation>
     </message>
@@ -660,48 +850,84 @@ Please consider generating a new key file.</source>
         <translation>Початкові дані: </translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>У CSV файлі знайдено помилку(-ки)!</translation>
+        <source>Error</source>
+        <translation>Помилка</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation> решта повідомлень пропущена]</translation>
+        <source>Empty fieldname %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Помилка</translation>
+        <source>column %1</source>
+        <translation>колонка %1</translation>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>Імпорт CSV – помилки записувача:
-</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>Помилка</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Неможливо обчислити головний ключ</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
-        <translation><numerusform>%n байт, </numerusform><numerusform>%n байти, </numerusform><numerusform>%n байтів, </numerusform><numerusform>%n байтів, </numerusform></translation>
+        <source>%n column(s)</source>
+        <translation><numerusform>%n колонка</numerusform><numerusform>%n колонки</numerusform><numerusform>%n колонок</numerusform><numerusform>%n колонок</numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation>%1, %2, %3</translation>
     </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
-        <translation><numerusform>%n рядок, </numerusform><numerusform>%n рядка, </numerusform><numerusform>%n рядків, </numerusform><numerusform>%n рядків, </numerusform></translation>
+        <source>%n byte(s)</source>
+        <translation><numerusform>%n байт</numerusform><numerusform>%n байти</numerusform><numerusform>%n байтів</numerusform><numerusform>%n байтів</numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
-        <translation><numerusform>%n колонка</numerusform><numerusform>%n колонки</numerusform><numerusform>%n колонок</numerusform><numerusform>%n колонок</numerusform></translation>
+        <source>%n row(s)</source>
+        <translation><numerusform>%n рядок</numerusform><numerusform>%n рядки</numerusform><numerusform>%n рядків</numerusform><numerusform>%n рядків</numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>Корінь</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>Файл %1 не існує.</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Неможливо відкрити файл %1.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation>Помилка читання сховища: %1</translation>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation>Не вдалося зберегти, для сховища не вказане ім&apos;я файлу.</translation>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation>Неможливо записати файл, оскільки він відкритий у режимі читання.</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation>Розблокувати сховище - KeePassXC</translation>
     </message>
 </context>
 <context>
@@ -731,14 +957,6 @@ Please consider generating a new key file.</source>
         <translation>Виклик-відповідь:</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Неможливо відкрити сховище.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Не вдається відкрити файл-ключ</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation>Застарілий формат файла-ключа</translation>
     </message>
@@ -768,105 +986,171 @@ Please consider generating a new key file.</source>
         <source>Select key file</source>
         <translation>Оберіть файл-ключ</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>Полагодити сховище</translation>
+        <source>TouchID for quick unlock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>Помилка</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation>Неможливо відкрити сховище:
+%1</translation>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>Не вдається відкрити файл-ключ</translation>
+        <source>Can't open key file:
+%1</source>
+        <translation>Не вдається відкрити файл ключа:
+%1</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Неможливо відкрити сховище.</translation>
+        <source>Passwords</source>
+        <translation>Паролі</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Розширені налаштування</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Загальні</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Сховище відкрито без помилок. Оброблення не потрібне.</translation>
+        <source>Security</source>
+        <translation>Безпека</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>Успішно</translation>
+        <source>Master Key</source>
+        <translation>Головний ключ</translation>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>Лагодження сховища успішно завершене.
-Тепер Ви можете його зберегти.</translation>
+        <source>Encryption Settings</source>
+        <translation>Налаштування шифрування</translation>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>Неможливо полагодити сховище.</translation>
+        <source>Browser Integration</source>
+        <translation>Сполучення з переглядачем</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>Загальні</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation>Налаштування KeePassXC-Browser</translation>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>Шифрування</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>&amp;Від&apos;єднати від усіх переглядачів</translation>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Кількість циклів надто висока</translation>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation type="unfinished"/>
     </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>Ви використовуєте надто багато циклів перетворення для ключа у форматі Argon2.
-
-Якщо Ви залишите таку кількість циклів, відкриття Вашого сховища може тривати кілька годин або днів (чи навіть довше)!</translation>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Understood, keep number</source>
-        <translation>Зрозуміло, залишити таку кількість</translation>
+        <source>Stored keys</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>Скасувати</translation>
+        <source>Remove</source>
+        <translation>Видалити</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
-        <translation>Кількість циклів надто низька</translation>
+        <source>Delete the selected key?</source>
+        <translation type="unfinished"/>
     </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>Ви використовуєте надто мало циклів перетворення для ключа у форматі AES-KDF.
-
-Якщо Ви залишите таку кількість циклів, Ваше сховище буде легко зламати!</translation>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KDF unchanged</source>
-        <translation>ФОК не змінено</translation>
+        <source>Key</source>
+        <translation>Ключ</translation>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
-        <translation>Спроба перетворити ключ згідно з новими налаштуваннями ФОК зазнала невдачі; ФОК залишилась без змін.</translation>
+        <source>Value</source>
+        <translation>Значення</translation>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: жодного ключа не знайдено</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: ключі видалено зі сховища</translation>
     </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
-        <translation><numerusform>МіБ</numerusform><numerusform>МіБ</numerusform><numerusform>МіБ</numerusform><numerusform>МіБ</numerusform></translation>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation>Ви дійсно бажаєте позбутися всіх специфічних для сайту налаштувань з кожного запису?
+Дозволи доступу до записів будуть скасовані.</translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Видалення збережених дозволів...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Скасувати</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: дозволи видалено</translation>
     </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
-        <translation><numerusform>потік</numerusform><numerusform>потоки</numerusform><numerusform>потоків</numerusform><numerusform>потоків</numerusform></translation>
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation><numerusform>Успішно видалено дозволи з %n запису.</numerusform><numerusform>Успішно видалено дозволи з %n записів.</numerusform><numerusform>Успішно видалено дозволи з %n записів.</numerusform><numerusform>Успішно видалено дозволи з %n записів.</numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: запис з дозволами не знайдено!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Поточне сховище не містить записів з дозволами.</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
     </message>
 </context>
 <context>
@@ -903,6 +1187,113 @@ If you keep this number, your database may be too easy to crack!</source>
         <source>Parallelism:</source>
         <translation>Паралельність:</translation>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Кількість циклів надто висока</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>Ви використовуєте надто багато циклів перетворення для ключа у форматі Argon2.
+
+Якщо Ви залишите таку кількість циклів, відкриття Вашого сховища може тривати кілька годин або днів (чи навіть довше)!</translation>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation>Зрозуміло, залишити таку кількість</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Скасувати</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Кількість циклів надто низька</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>Ви використовуєте надто мало циклів перетворення для ключа у форматі AES-KDF.
+
+Якщо Ви залишите таку кількість циклів, Ваше сховище буде легко зламати!</translation>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation>ФОК не змінено</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation>Спроба перетворити ключ згідно з новими налаштуваннями ФОК зазнала невдачі; ФОК залишилась без змін.</translation>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -952,91 +1343,110 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>Корінь</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Сховище KeePass 2</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Всі файли</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Відкрити сховище</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>Файл не знайдено!</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Неможливо відкрити сховище.</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>Файл відкритий лише для читання.</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>Відкрити CSV файл</translation>
+        <source>Add additional protection...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>Файл CSV</translation>
+        <source>No encryption key added</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>Усі файли (*)</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Об&apos;єднати сховище</translation>
+        <source>No password set</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Відкрити сховище KeePass 1</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 type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>Сховище KeePass 1</translation>
+        <source>Unknown error</source>
+        <translation>Невідома помилка</translation>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>Закрити?</translation>
+        <source>Failed to change master key</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>«%1» в режимі редагування.
-Відхилити зміни і все одно закрити?</translation>
+        <source>Database Name:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>Зберегти зміни?</translation>
+        <source>Description:</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>«%1» змінено.
-Зберегти зміни?</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Сховище KeePass 2</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Записати сховище не вдалося.</translation>
+        <source>All files</source>
+        <translation>Всі файли</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Паролі</translation>
+        <source>Open database</source>
+        <translation>Відкрити сховище</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Зберегти сховище як</translation>
+        <source>CSV file</source>
+        <translation>Файл CSV</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>Об&apos;єднати сховище</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Відкрити сховище KeePass 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>Сховище KeePass 1</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1047,40 +1457,40 @@ Save changes?</source>
         <translation>Не вдалось записати CSV файл.</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>Нове сховище</translation>
+        <source>Database creation error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>locked</source>
-        <translation>заблоковано</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 type="unfinished"/>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>Заблокувати сховище</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>Неможливо заблокувати сховище, яке Ви зараз редагуєте.
-Натисніть «скасувати», щоб завершити зміни або відкинути їх.</translation>
+        <source>Select CSV file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>Сховище містить незбережені зміни.
-Зберегти сховище перед блокуванням?
-Якщо сховище не зберегти, усі внесені зміни буде втрачено.</translation>
+        <source>New Database</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disable safe saves?</source>
-        <translation>Вимкнути безпечне збереження?</translation>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
     </message>
     <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 не зміг зберегти сховище кілька разів поспіль. Швидше за все це сталося тому, що служба узгодження файлів блокує файл для запису.
-Вимкнути безпечне збереження і спробувати знов?</translation>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1090,37 +1500,13 @@ Disable safe saves and try again?</source>
         <translation>Триває пошук…</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>Змінити головний ключ</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>Видалити запис?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>Ви дійсно хочете остаточно видалити запис «%1»?</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Видалити записи?</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Ви дійсно хочете остаточно видалити %1 записи(-ів)?</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Перемістити запис у смітник?</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation>Ви дійсно хочете перемістити запис «%1» у смітник?</translation>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Перемістити записи в смітник?</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation><numerusform>Ви дійсно хочете перемістити %n запис у смітник?</numerusform><numerusform>Ви дійсно хочете перемістити %n записи у смітник?</numerusform><numerusform>Ви дійсно хочете перемістити %n записів у смітник?</numerusform><numerusform>Ви дійсно хочете перемістити %n записів у смітник?</numerusform></translation>
@@ -1138,18 +1524,10 @@ Disable safe saves and try again?</source>
         <translation>Запам&apos;ятати мій вибір</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Видалити групу?</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>Ви дійсно хочете остаточно видалити групу «%1»?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Неможливо обчислити головний ключ</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>Сховище не обране.</translation>
     </message>
@@ -1184,10 +1562,6 @@ Do you want to merge your changes?</source>
 Об‘єднати ці зміни?</translation>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>Не вдалося відкрити нове сховище під час автоматичного перезавантаження цього сховища.</translation>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>Спорожнити смітник?</translation>
     </message>
@@ -1195,88 +1569,104 @@ Do you want to merge your changes?</source>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>Ви дійсно бажаєте остаточно видалити все зі смітника?</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>Створити позначку ТОП</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Закрити</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Файл відкритий лише для читання.</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Загальні</translation>
+        <source>Lock Database?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Пароль</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>«%1» змінено.
+Зберегти зміни?</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>Знечинюється</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Ім’я користувача</translation>
+        <source>Save changes?</source>
+        <translation>Зберегти зміни?</translation>
     </message>
     <message>
-        <source>Autotype</source>
-        <translation>Автозаповнення</translation>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>Пошук</translation>
+        <source>Disable safe saves?</source>
+        <translation>Вимкнути безпечне збереження?</translation>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>Атрибути</translation>
+        <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 не зміг зберегти сховище кілька разів поспіль. Швидше за все це сталося тому, що служба узгодження файлів блокує файл для запису.
+Вимкнути безпечне збереження і спробувати знов?</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Вкладення</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>Примітки</translation>
+        <source>Passwords</source>
+        <translation>Паролі</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>Вікно</translation>
+        <source>Save database as</source>
+        <translation>Зберегти сховище як</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>Послідовність</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Сховище KeePass 2</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>Пошук</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Очистити</translation>
+        <source>Delete group</source>
+        <translation>Видалити групу</translation>
     </message>
     <message>
-        <source>Never</source>
-        <translation>Ніколи</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[ЗАХИЩЕНО]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>Вимкнено</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Увімкнено</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1350,22 +1740,10 @@ Do you want to merge your changes?</source>
         <translation>Новий атрибут</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Схвалити видалення</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>Ви дійсно бажаєте видалити цей атрибут?</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[ЗАХИЩЕНО]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation>Натисніть «показати» для перегляду або зміни</translation>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>Завтра</translation>
     </message>
@@ -1378,10 +1756,6 @@ Do you want to merge your changes?</source>
         <translation><numerusform>%n місяць</numerusform><numerusform>%n місяця</numerusform><numerusform>%n місяців</numerusform><numerusform>%n місяців</numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 рік</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation>Застосувати створений пароль?</translation>
     </message>
@@ -1393,6 +1767,26 @@ Do you want to merge your changes?</source>
         <source>Entry updated successfully.</source>
         <translation>Запис успішно оновлено.</translation>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation>[ЗАХИЩЕНО] Натисніть «показати», щоб переглянути або змінити</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1638,6 +2032,81 @@ Do you want to merge your changes?</source>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Пароль:</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1695,10 +2164,6 @@ Do you want to merge your changes?</source>
         <translation>Неможливо дістати фавікон.</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Порада: Ви можете увімкнути Google як запасний варіант шляхом вибору Інструменти&gt;Налаштування&gt;Безпека</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>Зображення</translation>
     </message>
@@ -1707,14 +2172,6 @@ Do you want to merge your changes?</source>
         <translation>Всі файли</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>Вибір зображення</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read icon</source>
-        <translation>Неможливо прочитати значок</translation>
-    </message>
-    <message>
         <source>Custom icon already exists</source>
         <translation>Свій значок вже існує</translation>
     </message>
@@ -1723,8 +2180,36 @@ Do you want to merge your changes?</source>
         <translation>Схвалити видалення</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>Цей значок використовують %1 записи. Він буде замінений типовим значком. Ви дійсно бажаєте видалити його?</translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1775,9 +2260,8 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation> – клон</translation>
+        <source>%1 - Clone</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1822,10 +2306,6 @@ This may cause the affected plugins to malfunction.</source>
         <translation><numerusform>Ви дійсно бажаєте видалити %n вкладення?</numerusform><numerusform>Ви дійсно бажаєте видалити %n вкладення?</numerusform><numerusform>Ви дійсно бажаєте видалити %n вкладень?</numerusform><numerusform>Ви дійсно бажаєте видалити %n вкладень?</numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>Схвалити видалення</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>Зберегти вкладення</translation>
     </message>
@@ -1862,10 +2342,13 @@ This may cause the affected plugins to malfunction.</source>
 %1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>Неможливо відкрити файли:
-%1</translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1949,6 +2432,106 @@ This may cause the affected plugins to malfunction.</source>
         <source>Attachments</source>
         <translation>Вкладення</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP</translation>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>Створити позначку ТОП</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Закрити</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Загальні</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Ім’я користувача</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Пароль</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Знечинюється</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>Атрибути</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Вкладення</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Примітки</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Автозаповнення</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Вікно</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Послідовність</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Пошук</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Пошук</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Очистити</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Ніколи</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[ЗАХИЩЕНО]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Увімкнено</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Вимкнено</translation>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EntryView</name>
@@ -1987,6 +2570,19 @@ This may cause the affected plugins to malfunction.</source>
         <source>Recycle Bin</source>
         <translation>Смітник</translation>
     </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>HostInstaller</name>
@@ -2000,61 +2596,6 @@ This may cause the affected plugins to malfunction.</source>
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>Довжина:</translation>
-    </message>
-    <message>
-        <source>Character Types</source>
-        <translation>Види символів</translation>
-    </message>
-    <message>
-        <source>Upper Case Letters</source>
-        <translation>Великі літери</translation>
-    </message>
-    <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
-    </message>
-    <message>
-        <source>Lower Case Letters</source>
-        <translation>Малі літери</translation>
-    </message>
-    <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
-    </message>
-    <message>
-        <source>Numbers</source>
-        <translation>Цифри</translation>
-    </message>
-    <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
-    </message>
-    <message>
-        <source>Special Characters</source>
-        <translation>Спеціальні символи</translation>
-    </message>
-    <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
-    </message>
-    <message>
-        <source>Exclude look-alike characters</source>
-        <translation>Виключити неоднозначні символи</translation>
-    </message>
-    <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>Забезпечити входження до пароля символів з кожної групи</translation>
-    </message>
-    <message>
-        <source>Extended ASCII</source>
-        <translation>Розширені ASCII</translation>
-    </message>
-</context>
-<context>
     <name>KMessageWidget</name>
     <message>
         <source>&amp;Close</source>
@@ -2079,6 +2620,26 @@ This may cause the affected plugins to malfunction.</source>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Неправильний ключ або пошкоджене сховище.</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation>відсутні заголовки сховища</translation>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>Хибний розмір ідентифікатора заголовка</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>Хибна довжина поля заголовка</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>Хибна довжина даних заголовка</translation>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2238,10 +2799,6 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation>Хибна довжина uuid шифру</translation>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation>Непідтримуваний шифр</translation>
     </message>
@@ -2295,6 +2852,18 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Unsupported KeePass 2 database version.</source>
         <translation>Непідтримувана версія сховища KeePass 2.</translation>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2367,10 +2936,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Елемент журналу з відмінним uuid</translation>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation>Неможливо розшифрувати текст запису</translation>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation>Знайдено дублікат Вашого власного атрибута</translation>
     </message>
@@ -2419,6 +2984,12 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation>Неможливо розпакувати двійковий код</translation>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2582,28 +3153,126 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Invalid entry field type</source>
         <translation>Хибний тип поля запису</translation>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>Наявний блокувальний файл режиму одного примірника є хибним. Запускаємо новий примірник.</translation>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>Неможливо створити блокувальний файл. Режим одного примірника вимкнено.</translation>
+        <source>Import from</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Інший примірник KeePassXC вже запущено.</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Невиправна помилка в процесі тестування криптографічних функцій.</translation>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC – помилка</translation>
+        <source>Key Component</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Скасувати</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>Огляд</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Створити</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Файли-ключі</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Всі файли</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Створити файл-ключ...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Обрати файл-ключ</translation>
     </message>
 </context>
 <context>
@@ -2617,10 +3286,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Останні сховища</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Імпорт</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation>Довідка</translation>
     </message>
@@ -2629,14 +3294,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Записи</translation>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>Скопіювати атрибут у кишеню</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation>Тимчасовий одноразовий пароль</translation>
-    </message>
-    <message>
         <source>&amp;Groups</source>
         <translation>Групи</translation>
     </message>
@@ -2665,30 +3322,10 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Закрити сховище</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>Нове сховище</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>Об&apos;єднати зі сховищем KeePassX</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>Додати новий запис</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>Переглянути/змінити запис</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>Видалити запис</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>Додати нову групу</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>Змінити групу</translation>
     </message>
@@ -2701,14 +3338,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Зберегти сховище як…</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Змінити головний ключ…</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>Налаштування сховища</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>Налаштування сховища</translation>
     </message>
@@ -2717,10 +3346,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Клонувати запис</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>Знайти</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>Скопіювати ім&apos;я користувача</translation>
     </message>
@@ -2729,10 +3354,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Скопіювати ім’я користувача в кишеню</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>Скопіювати пароль</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>Скопіювати пароль у кишеню</translation>
     </message>
@@ -2745,14 +3366,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Генератор паролів</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation>Виконати автозаповнення</translation>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>Відкрити URL</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>Замкнути сховища</translation>
     </message>
@@ -2785,22 +3398,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Експортувати до файлу CSV…</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Імпортувати сховище KeePass 1…</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>Імпортувати файл CSV…</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Полагодити сховище…</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>Показати ТОП</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>Налаштувати ТОП…</translation>
     </message>
@@ -2821,14 +3418,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Помилка доступу до файлу конфігурації %1</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Схоже, що Ви використовуєте KeePassHTTP для сполучення з переглядачем. Цей засіб застарів і буде незабаром видалений. &lt;br&gt;Натомість, перейдіть, будь ласка, до використання KeePassXC-Переглядача! Інформацію щодо переходу Ви можете знайти у нашому &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;посібнику&lt;/a&gt; (попередження %1 of 3).&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>тільки для читання</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Налаштування</translation>
     </message>
@@ -2841,36 +3430,277 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Вийти з KeePassXC</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Сховище KeePass 2</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Натисніть, будь ласка, кнопку на вашому YubiKey!</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Всі файли</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation>Попередження: Ви використовуєте нестійку збірку KeePassXC!
+Зберігайте резервну копію Ваших сховищ через підвищений ризик пошкодження даних.
+Ця версія не призначена для повсякденного користування.</translation>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Відкрити сховище</translation>
+        <source>&amp;Donate</source>
+        <translation>Пожерт&amp;вувати</translation>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Зберегти налагоджене сховище</translation>
+        <source>Report a &amp;bug</source>
+        <translation>Повідомит&amp;и про помилку</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Записати сховище не вдалося.</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Натисніть, будь ласка, кнопку на вашому YubiKey!</translation>
+        <source>&amp;Import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
-        <translation>Попередження: Ви використовуєте нестійку збірку KeePassXC!
-Зберігайте резервну копію Ваших сховищ через підвищений ризик пошкодження даних.
-Ця версія не призначена для повсякденного користування.</translation>
+        <source>Copy att&amp;ribute...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation>TOTP...</translation>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation>Показати TOTP...</translation>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation>Показати QR-код TOTP...</translation>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Корінь</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Розширені налаштування</translation>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <translation>Налаштування шифрування</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 type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2973,125 +3803,34 @@ This version is not meant for production use.</source>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>Dialog</source>
-        <translation>Діалог</translation>
-    </message>
-    <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>Це необхідно, щоб надати ChromeIPass або PassIFox доступ до вашого сховища</translation>
-    </message>
-    <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>Увімкнути сервер KeePassHTTP</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Загальні</translation>
-    </message>
-    <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>Показувати повідомлення, коли надходить запит на реєстраційні дані</translation>
-    </message>
-    <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>Показувати лише найкращі збіги для певного URL замість усіх записів для всієї області.</translation>
-    </message>
-    <message>
-        <source>&amp;Return only best matching entries</source>
-        <translation>Показувати лише найкращі збіги</translation>
-    </message>
-    <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Запитувати щодо розблокування сховища, якщо воно заблоковане</translation>
-    </message>
-    <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation>Показані тільки записи з такою самою схемою (http://, https://, ftp://, …).</translation>
-    </message>
-    <message>
-        <source>&amp;Match URL schemes</source>
-        <translation>Узгодити зі схемами URL</translation>
-    </message>
-    <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Сортувати збіги за ім&apos;ям користувача</translation>
-    </message>
-    <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Сортувати збіги за заголовком</translation>
-    </message>
-    <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>Видалити всі спільні шифрувальні ключі з поточного сховища</translation>
-    </message>
-    <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>Видалити всі збережені привілеї для записів у поточному сховищі</translation>
-    </message>
-    <message>
-        <source>Password Generator</source>
-        <translation>Генератор паролів</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Розширені</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Завжди дозволяти доступ до записів</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Завжди дозволяти оновлення записів</translation>
-    </message>
-    <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>Тільки вибране сховище має бути під&apos;єднаним через клієнта.</translation>
-    </message>
-    <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Шукати збіги у всіх відкритих сховищах</translation>
-    </message>
-    <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>Автоматичне створення та оновлення текстових полів не втілене.</translation>
-    </message>
-    <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>Показати розширені текстові поля, що починаються з «KPH: »</translation>
-    </message>
-    <message>
-        <source>HTTP Port:</source>
-        <translation>Шлюз HTTP:</translation>
+        <source>Enter password:</source>
+        <translation>Введіть пароль:</translation>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Типовий шлюз: 19455</translation>
+        <source>Confirm password:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC чекатиме на сигнали через цей шлюз за адресою 127.0.0.1</translation>
+        <source>Password</source>
+        <translation>Пароль</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;Попередження:&lt;/b&gt; ці параметри можуть бути небезпечними!</translation>
+        <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"/>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;KeePassHTTP застарів і може бути видалений у майбутньому.&lt;br&gt;Натомість, перейдіть, будь ласка, до використання KeePassXC-Переглядача! Інформацію щодо переходу Ви можете знайти у нашому &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;посібнику&lt;/a&gt;.&lt;/p&gt;</translation>
+        <source>Password cannot be empty.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Неможливо приєднатись до привілейованих шлюзів</translation>
+        <source>Passwords do not match.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Неможливо приєднатись до привілейованих шлюзів нижче 1024!
-Натомість буде використано шлюз 19455.</translation>
+        <source>Generate master password</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3162,18 +3901,10 @@ Using default port 19455.</source>
         <translation>Перелік слів:</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Кількість слів:</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>Розділювач слів:</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>Створити</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Скопіювати</translation>
     </message>
@@ -3186,10 +3917,6 @@ Using default port 19455.</source>
         <translation>Закрити</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>Застосувати</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>Ентропія: %1 біт</translation>
     </message>
@@ -3217,6 +3944,171 @@ Using default port 19455.</source>
         <comment>Password quality</comment>
         <translation>Відмінна</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Розширені</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Видалити</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Видалити</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Вимкнути</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3237,34 +4129,18 @@ Using default port 19455.</source>
         <translation>Неможливо розшифрувати повідомлення</translation>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
-        <translation>Перевищено час очікування або неможливо під&apos;єднатися до KeePassXC</translation>
-    </message>
-    <message>
         <source>Action cancelled or denied</source>
         <translation>Дію скасовано або заборонено</translation>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation>Неможливо зашифрувати повідомлення або знайти відкритий ключ. Переконайтеся, що власний обмін повідомленнями у KeePassXC ввімкнено.</translation>
-    </message>
-    <message>
         <source>KeePassXC association failed, try again</source>
         <translation>Прив&apos;язка KeePassXC зазнала невдачі, спробуйте ще раз</translation>
     </message>
     <message>
-        <source>Key change was not successful</source>
-        <translation>Зміна ключа зазнала невдачі</translation>
-    </message>
-    <message>
         <source>Encryption key is not recognized</source>
         <translation>Шифрувальний ключ не розпізнано</translation>
     </message>
     <message>
-        <source>No saved databases found</source>
-        <translation>Збережених сховищ не знайдено</translation>
-    </message>
-    <message>
         <source>Incorrect action</source>
         <translation>Хибна дія</translation>
     </message>
@@ -3390,10 +4266,6 @@ Using default port 19455.</source>
         <translation>Вставте пароль для відкриття %1: </translation>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation>Не вдалося завантажити файл ключа %1 : %2</translation>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3447,7 +4319,7 @@ Available commands:
     </message>
     <message>
         <source>Use the same credentials for both database files.</source>
-        <translation>Використовувати ті ж самі реєстраційні дані для обох сховищ.</translation>
+        <translation>Використовувати однакові реєстраційні дані для обох сховищ.</translation>
     </message>
     <message>
         <source>Key file of the database to merge from.</source>
@@ -3478,12 +4350,6 @@ Available commands:
         <translation>помилка читання з пристрою</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>файл порожній!
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation>хибне рядкове значення</translation>
     </message>
@@ -3492,30 +4358,6 @@ Available commands:
         <translation>бракує закривальних лапок</translation>
     </message>
     <message>
-        <source>AES: 256-bit</source>
-        <translation>AES: 256-біт</translation>
-    </message>
-    <message>
-        <source>Twofish: 256-bit</source>
-        <translation>Twofish: 256-біт</translation>
-    </message>
-    <message>
-        <source>ChaCha20: 256-bit</source>
-        <translation>ChaCha20: 256-біт</translation>
-    </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – рекомендовано)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 4)</source>
-        <translation>AES-KDF (KDBX 4)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 3.1)</source>
-        <translation>AES-KDF (KDBX 3.1)</translation>
-    </message>
-    <message>
         <source>Group</source>
         <translation>Група</translation>
     </message>
@@ -3544,10 +4386,6 @@ Available commands:
         <translation>Створено</translation>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
-        <translation>Застарілий тип сполучення з переглядачем</translation>
-    </message>
-    <message>
         <source>Browser Integration</source>
         <translation>Сполучення з переглядачем</translation>
     </message>
@@ -3576,10 +4414,6 @@ Available commands:
         <translation>Кількість слів у виразі пароля.</translation>
     </message>
     <message>
-        <source>count</source>
-        <translation>кількість</translation>
-    </message>
-    <message>
         <source>Wordlist for the diceware generator.
 [Default: EFF English]</source>
         <translation>Список слів для генератора паролів методом diceware.
@@ -3590,28 +4424,438 @@ Available commands:
         <translation>Створити новий випадковий пароль.</translation>
     </message>
     <message>
-        <source>Length of the generated password.</source>
-        <translation>Довжина створюваного пароля.</translation>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
-        <translation>Використовувати малі літери для створення пароля.</translation>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
-        <translation>Використовувати великі літери для створення пароля.</translation>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation>Копіювати поточний TOTP до буферу обміну.</translation>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
-        <translation>Використовувати цифри для створення пароля.</translation>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
-        <translation>Використовувати спеціальні символи для створення пароля.</translation>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
-        <translation>Використовувати розширений набір ASCII для створення пароля.</translation>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation>Запис із шляхом %1 не має налаштованого TOTP.</translation>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation>Поточний TOTP запису скопійовано до буферу обміну!</translation>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation>кількість</translation>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>Файл %1 не існує.</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>Неможливо відкрити файл %1.</translation>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation>Виключати схожі символи</translation>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation>Використовувати символи з кожної групи</translation>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation>Неможливо зберегти сховище до файлу : %1</translation>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation>Неможливо зберегти сховище до файлу: %1</translation>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation>Успішно видалено запис %1.</translation>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation>Успішно вилучено запис %1.</translation>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation>Показати поточний TOTP запису.</translation>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation>ПОМИЛКА: невідомий атрибут %1.</translation>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256-біт</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256-біт</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256-біт</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – рекомендовано)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>Видалити запис зі сховища.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>Шлях до запису, що підлягає видаленню.</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>Наявний блокувальний файл режиму одного примірника є хибним. Запускаємо новий примірник.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Неможливо створити блокувальний файл. Режим одного примірника вимкнено.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC – багатоплатформний розпорядник паролів</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>назви файлів сховищ, які треба відкрити (*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>шлях до власного файла налаштувань</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>файл-ключ сховища</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>отримати пароль до сховища із stdin</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation>Логічний номер батьківського вікна</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Інший примірник KeePassXC вже запущено.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Невиправна помилка в процесі тестування криптографічних функцій.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC – помилка</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation>Пароль сховища:</translation>
     </message>
 </context>
 <context>
@@ -3649,12 +4893,98 @@ Available commands:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
+    <message>
+        <source>Agent connection failed.</source>
+        <translation>Не вдалося з&apos;єднатися з посередником.</translation>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation>Помилка протоколу посередника.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation>Немає запущеного посередника, неможливо додати ключ до в&apos;язки.</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation>Немає запущеного посередника, неможливо видалити ключ із в&apos;язки.</translation>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation>Посередник відхилив цей ключ. Ймовірні причини:</translation>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation>Цей ключ вже додано.</translation>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation>Обмеження часу не підтримується цим посередником (перевірте налаштування).</translation>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation>Запит підтвердження не підтримується цим посередником (перевірте налаштування).</translation>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
     <message>
-        <source>Search...</source>
-        <translation>Знайти...</translation>
+        <source>Search Help</source>
+        <translation>Довідка з пошуку</translation>
     </message>
     <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation>Всі пошукові терміни повинні співпадати (тобто, логічне І)</translation>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation>Модифікатори</translation>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation>Поля</translation>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation>логічне АБО</translation>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation>Приклади</translation>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
         <source>Search</source>
         <translation>Пошук</translation>
     </message>
@@ -3663,317 +4993,319 @@ Available commands:
         <translation>Очистити</translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Чутливість до регістру</translation>
-    </message>
-    <message>
         <source>Limit search to selected group</source>
         <translation>Обмежити пошук вибраною групою</translation>
     </message>
+    <message>
+        <source>Search Help</source>
+        <translation>Довідка з пошуку</translation>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation>Знайти (%1)...</translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation>Враховується регістр</translation>
+    </message>
 </context>
 <context>
-    <name>Service</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC: новий запит на прив&apos;язку ключа</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation>Ви одержали запит на прив&apos;язку вказаного ключа.
-Якщо Ви бажаєте надати доступ до Вашого сховища KeePassXC,
-вкажіть унікальну назву та схваліть прив&apos;язку.</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: перезаписати наявний ключ?</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Спільний ключ шифрування з назвою «%1» вже існує.
-Перезаписати його?</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: оновити запис</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Бажаєте оновити інформацію у %1 – %2?</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: сховище заблоковане!</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Чинне сховище заблоковане!
-Будь ласка, розблокуйте обране сховище або виберіть інше незаблоковане.</translation>
+        <source>Key:</source>
+        <translation>Ключ:</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: ключі видалено зі сховища</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation><numerusform>Успішно видалено %n шифрувальний ключ з HTTP налаштувань KeePassX.</numerusform><numerusform>Успішно видалено %n шифрувальних ключа з HTTP налаштувань KeePassX.</numerusform><numerusform>Успішно видалено %n шифрувальних ключів з HTTP налаштувань KeePassX.</numerusform><numerusform>Успішно видалено %n шифрувальних ключів з HTTP налаштувань KeePassX.</numerusform></translation>
+        <source>Generate</source>
+        <translation>Створити</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: жодного ключа не знайдено</translation>
+        <source>Import</source>
+        <translation>Імпорт</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>Не знайдено спільних ключів шифрування у налаштуваннях KeePassHttp.</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: налаштування недоступні!</translation>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>Поточне сховище не містить налаштувань KeePassHttp.</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>Видалення збережених привілеїв…</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>Скасувати</translation>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: привілеї видалено</translation>
+        <source>Remove</source>
+        <translation>Видалити</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation><numerusform>Успішно видалено привілеї для %n запису.</numerusform><numerusform>Успішно видалено привілеї для %n записів.</numerusform><numerusform>Успішно видалено привілеї для %n записів.</numerusform><numerusform>Успішно видалено привілеї для %n записів.</numerusform></translation>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC: запис з привілеями не знайдено!</translation>
+        <source>Status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Поточне сховище не містить записів з привілеями.</translation>
+        <source>Fingerprint</source>
+        <translation>Відбиток</translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
-        <translation>Налаштування застосунку</translation>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Загальні</translation>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>Безпека</translation>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>Помилка доступу до файлу конфігурації %1</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>Базові налаштування</translation>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Запускати лише один примірник KeePassXC</translation>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>Пам’ятати останні сховища</translation>
+        <source>All files</source>
+        <translation>Всі файли</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Пам&apos;ятати останні файли ключів і механізми захисту</translation>
+        <source>Select path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Завантажувати попереднє сховище під час запуску</translation>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>Автоматично зберігати перед виходом</translation>
+        <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"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>Автоматично зберігати після кожної зміни</translation>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Автоматично перезавантажувати сховище після зовнішніх змін</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>Згортати після копіювання до кишені</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Згортати вікно після запуску застосунку</translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>Використовувати для нових записів значок групи</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Не помічати сховище зміненим після змін, що не стосуються даних (напр. розкриття груп)</translation>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
-        <translation>Сховати докладний перегляд</translation>
+        <source>Never</source>
+        <translation>Ніколи</translation>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>Показувати значок у системному лотку</translation>
+        <source>Always</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>Після згортання ховати вікно в системний лоток</translation>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
-        <translation>Ховати вікно в системний лоток замість закриття застосунку</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
-        <translation>Темний значок у системному лотку</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Мова</translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Автозаповнення</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>Використовувати заголовок запису для знаходження відповідного вікна у глобальному автозаповненні</translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>Використовувати URL запису для знаходження відповідного вікна у глобальному автозаповненні</translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation>Завжди питати перед автозаповненням</translation>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Глобальні сполучення клавіш для автозаповнення</translation>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>Затримка автозаповнення</translation>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation> мс</translation>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
-        <translation>Запуск</translation>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
-        <translation>Керування файлами</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation>Безпечно зберігати файли сховища (може бути несумісним з Dropbox та ін.)</translation>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
-        <translation>Створювати резервну копію сховища перед збереженням</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
-        <translation>Керування записами</translation>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Загальні</translation>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
-        <translation>Час очікування</translation>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>Очищати кишеню через</translation>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> сек</translation>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>Блокувати сховища, неактивні протягом</translation>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Зручність</translation>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Блокувати сховища після блокування сесії або закриття кришки пристрою</translation>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>Блокувати сховища після згортання вікна</translation>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>TotpDialog</name>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>Не запитувати підтвердження пароля, якщо він не прихований</translation>
+        <source>Timed Password</source>
+        <translation>Тимчасовий пароль</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Типово показувати паролі у відкритому вигляді</translation>
+        <source>000000</source>
+        <translation>000000</translation>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
-        <translation>Приховувати паролі у панелі перегляду</translation>
+        <source>Copy</source>
+        <translation>Cкопіювати</translation>
+    </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation><numerusform>Втрачає чинність через &lt;b&gt;%n&lt;/b&gt; секунду</numerusform><numerusform>Втрачає чинність через &lt;b&gt;%n&lt;/b&gt; секунди</numerusform><numerusform>Втрачає чинність через &lt;b&gt;%n&lt;/b&gt; секунд</numerusform><numerusform>Втрачає чинність через &lt;b&gt;%n&lt;/b&gt; секунд</numerusform></translation>
     </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
     <message>
-        <source>Hide entry notes by default</source>
-        <translation>Типово приховувати нотатки до запису</translation>
+        <source>Copy</source>
+        <translation>Cкопіювати</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>Приватність</translation>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation>УВАГА: Такі налаштування TOTP є нестандартними і можуть не працювати з іншими автентифікаторами.</translation>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>Використовувати Google як запасний варіант для завантаження значків сторінок</translation>
+        <source>There was an error creating the QR code.</source>
+        <translation>Не вдалося створити QR-код.</translation>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
-        <translation>Блокувати попередньо заблоковане сховище після завершення автозаповнення</translation>
+        <source>Closing in %1 seconds.</source>
+        <translation>Закриється через %1 секунд.</translation>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
-        <translation>Встановити ТОП</translation>
+        <translation>Налаштування ТОП</translation>
     </message>
     <message>
         <source>Key:</source>
@@ -3992,59 +5324,84 @@ Please unlock the selected database or choose another one which is unlocked.</so
         <translation>Використовувати власні налаштування</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>Увага: змінюйте ці налаштування тільки якщо Ви певно знаєте, що Ви робите.</translation>
+        <source>Custom Settings</source>
+        <translation>Власні налаштування</translation>
     </message>
     <message>
         <source>Time step:</source>
         <translation>Крок зміни часу:</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8 цифр</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> сек</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>Розмір кодування:</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6 цифр</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>Розмір кодування:</translation>
+        <source>7 digits</source>
+        <translation>7 цифр</translation>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> сек</translation>
+        <source>8 digits</source>
+        <translation>8 цифр</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>Тимчасовий пароль</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Cкопіювати</translation>
+        <source>Close</source>
+        <translation>Закрити</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>Знечинюється через</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>секунд</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>Розблокувати сховище</translation>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4079,42 +5436,26 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
 </context>
 <context>
-    <name>main</name>
-    <message>
-        <source>Remove an entry from the database.</source>
-        <translation>Видалити запис зі сховища.</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>Шлях до сховища.</translation>
-    </message>
-    <message>
-        <source>Path of the entry to remove.</source>
-        <translation>Шлях до запису, що підлягає видаленню.</translation>
-    </message>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC – багатоплатформний розпорядник паролів</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>назви файлів сховищ, які треба відкрити (*.kdbx)</translation>
+        <source>Refresh</source>
+        <translation>Оновити</translation>
     </message>
     <message>
-        <source>path to a custom config file</source>
-        <translation>шлях до власного файла налаштувань</translation>
+        <source>YubiKey Challenge-Response</source>
+        <translation>YubiKey Challenge-Response</translation>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>файл-ключ сховища</translation>
+        <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>&lt;p&gt;Якщо у вас є &lt;a href=&quot;https://www.yubico.com/&quot;&gt;YubiKey&lt;/a&gt;, ви можете використовувати його для додаткової безпеки.&lt;/p&gt;&lt;p&gt;Один із слотів YubiKey має бути налаштованим як &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;</translation>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>отримати пароль до сховища із stdin</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation>YubiKey не знайдено, будь ласка, впевніться, що він підключений.</translation>
     </message>
     <message>
-        <source>Parent window handle</source>
-        <translation>Логічний номер батьківського вікна</translation>
+        <source>No YubiKey inserted.</source>
+        <translation>YubiKey не підключений.</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_zh_CN.ts b/share/translations/keepassx_zh_CN.ts
index ac976bbf2..ffdcfc302 100644
--- a/share/translations/keepassx_zh_CN.ts
+++ b/share/translations/keepassx_zh_CN.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>KeePassXC 使用第 2 版 GNU 通用公共授权协议（GPL）分发，你也可以根据需要选用第 3 版。</translation>
+        <translation>KeePassXC 使用第 2 版 GNU 通用公共授权协议（GPL）分发，（你也可以根据需要）选用第 3 版。</translation>
     </message>
     <message>
         <source>Contributors</source>
@@ -38,12 +38,6 @@
         <translation>复制到剪贴板</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>版本 %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>修订版本：%1</translation>
     </message>
@@ -76,42 +70,326 @@ CPU 架构：%2
         <translation>KeePassXC 团队特别感谢 debfx 开发了最初版 KeePassX</translation>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
-        <translation>构建类型：%1
-</translation>
+        <source>Version %1</source>
+        <translation>版本 %1</translation>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP 确认访问</translation>
+        <source>Build Type: %1</source>
+        <translation>构建类型： %1</translation>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>记住此选项</translation>
+        <source>Auto-Type</source>
+        <translation>自动输入</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>允许</translation>
+        <source>Browser Integration</source>
+        <translation>浏览器配合</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>拒绝</translation>
+        <source>SSH Agent</source>
+        <translation>SSH 代理</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>%1 请求获取这些条目的密码。
-请选择是否允许。</translation>
+        <source>YubiKey</source>
+        <translation>YubiKey</translation>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation>TouchID</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>无</translation>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AgentSettingsWidget</name>
     <message>
         <source>Enable SSH Agent (requires restart)</source>
-        <translation>启用 SSH 代理（需要重启）</translation>
+        <translation>启用 SSH 代理(需要重启)</translation>
+    </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>应用程序设置</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>常规</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>安全</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>访问配置文件出错 %1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>基础设置</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>启动</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>只启动一个 KeePassXC 实例</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>记住最近的数据库</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>记住上次的密钥文件和安全模块</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>在启动时加载最近的数据库</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>在应用程序启动时窗口最小化</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>文件管理</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation>安全保存数据库文件（可能与Dropbox等不兼容）</translation>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation>保存前备份数据库文件</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>修改后自动保存</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>离开后自动保存</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>不要因非数据的更改而将数据库标记为已修改 （比如增加群组）</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>当外部修改时自动重新加载数据库</translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>进入管理</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>新增项目时使用群组图标</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>复制到剪贴板后最小化</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation>在预览面板中隐藏条目</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>常规</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation>隐藏工具栏（图标）</translation>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation>最小化而不是退出应用程序</translation>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>显示任务栏图标</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>暗色系统托盘图标</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>将窗口最小化至任务栏</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>语言</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>自动输入</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>使用条目标题匹配全局自动类型的窗口</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>使用条目URL匹配全局自动类型的窗口</translation>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>总在执行自动输入前询问</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>自动输入全局快捷键</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation>自动输入时延迟</translation>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation>毫秒</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation>启用输入时延迟</translation>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>超时</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>在多久后清除剪贴板</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>秒</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>在多久没有动作之后锁住数据库</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation>分</translation>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation>没有动作后锁定TouchID</translation>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>便利性</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>系统锁定或盖子合上时锁定数据库</translation>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation>系统锁定或盖子关闭时锁定TouchID</translation>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>在最小化窗口后锁定数据库</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation>执行自动类型后重新锁定先前锁定的数据库</translation>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>可见时不需要重复输入密码</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation>编辑时不要隐藏密码</translation>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation>不要将占位符用于空密码字段</translation>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation>在预览面板条目中隐藏密码</translation>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>默认情况下隐藏条目备注</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>隐私</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation>使用 DuckDuckGo 作为下载网站图标的备选</translation>
     </message>
 </context>
 <context>
@@ -216,6 +494,27 @@ Please select whether you want to allow access.</source>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation>KeePassXC-浏览器保存条目</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>确定</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>取消</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation>您打开了多个数据库
+请选择正确的数据库以保存凭据。</translation>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -289,14 +588,6 @@ Please select whether you want to allow access.</source>
         <translation>根据用户名排列匹配的凭据</translation>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>断开与所有浏览器的关联</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>取消所有记住的权限</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>高级</translation>
     </message>
@@ -362,14 +653,6 @@ Please select whether you want to allow access.</source>
         <translation>&lt;b&gt;警告：&lt;/b&gt; 以下选项可能有危险！</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>可执行文件（*.exe）;;所有文件（*.*）</translation>
-    </message>
-    <message>
-        <source>Executable Files (*)</source>
-        <translation>可执行文件（*）</translation>
-    </message>
-    <message>
         <source>Select custom proxy location</source>
         <translation>选择自定义代理路径</translation>
     </message>
@@ -377,6 +660,31 @@ Please select whether you want to allow access.</source>
         <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
         <translation>非常抱歉，KeePassXC-Browser 当前不支持 Snap 发行包</translation>
     </message>
+    <message>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation>浏览器集成需要KeePassXC-Browser才能工作。&lt;br /&gt;下载 %1 和 %2。</translation>
+    </message>
+    <message>
+        <source>&amp;Tor Browser</source>
+        <translation>&amp;Tor浏览器</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: </source>
+        <translation>&lt;b&gt;警告&lt;/b&gt;，找不到keepassxc 代理应用程序！&lt;br /&gt;请检查KeePassXC安装目录或确认高级选项中的自定义路径。&lt;br /&gt;如果没有代理应用程序，浏览器集成将无法工作.&lt;br /&gt; 可执行路径：</translation>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation>可执行文件</translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <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"/>
+    </message>
 </context>
 <context>
     <name>BrowserService</name>
@@ -417,153 +725,46 @@ Do you want to overwrite it?</source>
         <translation>你想更新 %1-%2 中的信息吗？</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC：数据库被锁定！</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>激活的数据库被锁定 ！
-请解锁选定的数据库或选择另一已解锁的数据库。</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC：设置不可用！</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation>当前数据库中不包含设置的条目。</translation>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC：未找到键</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation>在KeePassXC设置中找不到共享加密密钥。</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC：从数据库中删除键</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation><numerusform>已成功从KeePassXC设置中删除了％n个加密密钥。</numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>正在删除存储的权限...</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>中断</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC：已删除的权限</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation><numerusform>已成功从%n个条目中删除权限。
-</numerusform></translation>
-    </message>
-    <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC： 未找到权限的条目！</translation>
+        <source>Converting attributes to custom data…</source>
+        <translation>将属性转换为自定义数据...</translation>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>当前数据库中不包含具有权限的条目。</translation>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation>KeePassXC：转换成KeePassHTTP属性</translation>
     </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
     <message>
-        <source>Password</source>
-        <translation>密码</translation>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation>成功转换了 %1 个条目的属性(s)
+将 %2 个密钥移动到自定义数据。</translation>
     </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>输入密码：</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>重复密码：</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>密钥文件(K)</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>浏览</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>创建</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>挑战应答(L)</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>刷新</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>密钥文件</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>所有文件</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>创建密钥文件...</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>无法创建密钥文件：</translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>选择密钥文件</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>空密码</translation>
-    </message>
-    <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>你确定要使用空密码？</translation>
-    </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>密码不一致</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation><numerusform>已成功将 %n 个密钥移动到自定义数据。</numerusform></translation>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>无法设置 %1 为秘钥文件:
-%2</translation>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation>KeePassXC：找不到KeePassHTTP属性的条目！</translation>
     </message>
     <message>
-        <source>Legacy key file format</source>
-        <translation>旧式密钥文件格式</translation>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation>当前数据库中没有KeePassHTTP属性的条目。</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>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation>KeePassXC：检测到旧版浏览器集成设置</translation>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>修改主密码失败：YubiKey 未插入。</translation>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation>已检测到旧版浏览器集成设置
+是否要将设置升级到最新标准？
+这对于保持与浏览器插件的兼容性是必要的。</translation>
     </message>
 </context>
 <context>
@@ -644,14 +845,6 @@ Please consider generating a new key file.</source>
         <translation>未出现在 CSV 文件中</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>空字段名</translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>列</translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>导入 CSV 文件</translation>
     </message>
@@ -660,48 +853,85 @@ Please consider generating a new key file.</source>
         <translation>原始数据：</translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>在 CSV 文件中检测到错误！</translation>
+        <source>Error</source>
+        <translation>错误</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation>更多的信息被跳过</translation>
+        <source>Empty fieldname %1</source>
+        <translation>空字段名 %1</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation>错误</translation>
+        <source>column %1</source>
+        <translation>列 %1</translation>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>CSV 导入： 编辑器错误：
-</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation>在 CSV 文件中检测到错误(s)！</translation>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>错误</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation><numerusform>[%n  信息(s) 被跳过]</numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>无法计算主密码</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation>CSV 导入： 编辑器错误：
+%1</translation>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
-        <translation><numerusform>%n 字节，</numerusform></translation>
+        <source>%n column(s)</source>
+        <translation><numerusform>%n 列</numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation>%1, %2, %3</translation>
     </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
-        <translation><numerusform>%n 行，</numerusform></translation>
+        <source>%n byte(s)</source>
+        <translation><numerusform>%n 字节(s)</numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
-        <translation><numerusform>%n 列</numerusform></translation>
+        <source>%n row(s)</source>
+        <translation><numerusform>%n 行(s)</numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>根群组</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>文件 %1 不存在。</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>无法打开文件 %1。</translation>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation>读取数据库时出错： %1</translation>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation>无法保存，数据库没有文件名。</translation>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation>文件无法写入，因为它以只读模式打开。</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation>解锁数据库 - KeePassXC</translation>
     </message>
 </context>
 <context>
@@ -731,14 +961,6 @@ Please consider generating a new key file.</source>
         <translation>挑战应答：</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>无法打开数据库</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>无法打开密钥文件</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation>旧式密钥文件格式</translation>
     </message>
@@ -767,105 +989,174 @@ Please consider generating a new key file.</source>
         <source>Select key file</source>
         <translation>选择密钥文件</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>修复数据库</translation>
+        <source>TouchID for quick unlock</source>
+        <translation>TouchID 快速解锁</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation>错误</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation>无法打开数据库：
+%1</translation>
+    </message>
+    <message>
+        <source>Can't open key file:
+%1</source>
+        <translation>无法打开密钥文件：
+%1</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>无法打开密钥文件</translation>
+        <source>Passwords</source>
+        <translation>密码</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>无法打开数据库</translation>
+        <source>Advanced Settings</source>
+        <translation>高级设置</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>数据库打开正常。没什么可做的。</translation>
+        <source>General</source>
+        <translation>常规</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>成功</translation>
+        <source>Security</source>
+        <translation>安全</translation>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>数据库已经修复成功
-现在可以保存数据库</translation>
+        <source>Master Key</source>
+        <translation>主密钥</translation>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>无法修复数据库</translation>
+        <source>Encryption Settings</source>
+        <translation>加密设置</translation>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation>浏览器配合</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>常规</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation>KeePassXC-浏览器设置</translation>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>加密</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>断开与所有浏览器的关联</translation>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
-        <translation>回合数太高</translation>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation>取消条目上所有特定于站点的设置</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>你正在对 Argon2 使用相当高的密钥转换回合数。
-
-如果仍执意使用此数量，你的数据库可能需要数小时或数天（甚至更长时间）才能打开！</translation>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation>将KeePassHTTP属性移动到KeePassXC-Browser和自定义数据</translation>
     </message>
     <message>
-        <source>Understood, keep number</source>
-        <translation>了解，仍使用此数量</translation>
+        <source>Stored keys</source>
+        <translation>存储密钥</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>取消</translation>
+        <source>Remove</source>
+        <translation>移除</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
-        <translation>回合数太低</translation>
+        <source>Delete the selected key?</source>
+        <translation>删除所选密钥？</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>你正对AES-KDF使用过低的密钥转换回合数。
-
-如果仍执意使用此数量，你的数据库可能会变得相当简单即能破解！</translation>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation>你确定要删除所选的密钥吗？
+这可能会影响与浏览器插件的连接。</translation>
     </message>
     <message>
-        <source>KDF unchanged</source>
-        <translation>KDF不变</translation>
+        <source>Key</source>
+        <translation>密钥</translation>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
-        <translation>无法使用新的KDF参数转换密钥; KDF不变。</translation>
+        <source>Value</source>
+        <translation>值</translation>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation>启用浏览器集成以访问这些设置。</translation>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation>断开与所有浏览器的关联</translation>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation>你确定要断开与所有浏览器的关联吗？
+这可能会影响与浏览器插件的连接。</translation>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC：未找到键</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation>在KeePassXC设置中找不到共享加密密钥。</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC：从数据库中删除键</translation>
     </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
-        <translation><numerusform> MiB</numerusform></translation>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation><numerusform>已成功从KeePassXC设置中删除了 %n 个加密密钥(s)。</numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation>取消条目上所有特定于站点的设置</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>您确定要取消每个条目上的所有特定于站点的设置吗？
+访问条目的权限将被撤销。</translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>正在删除存储的权限...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>中断</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC：已删除的权限</translation>
     </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
-        <translation><numerusform>线程</numerusform></translation>
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation><numerusform>已成功从 %n 个条目(s)中删除权限。</numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC： 未找到权限的条目！</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>当前数据库中不包含具有权限的条目。</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation>将KeePassHTTP属性移动到自定义数据</translation>
+    </message>
+    <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>您确定要将所有旧版浏览器集成数据移至最新标准吗？
+这对于保持与浏览器插件的兼容性是必要的。</translation>
     </message>
 </context>
 <context>
@@ -902,6 +1193,113 @@ If you keep this number, your database may be too easy to crack!</source>
         <source>Parallelism:</source>
         <translation>平行运算:</translation>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation>解密时间：</translation>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation>?? s</translation>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation>更改</translation>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation>100 毫秒</translation>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation>5 s</translation>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation>较高的值可提供更多保护，但打开数据库需要更长时间。</translation>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation>数据库格式：</translation>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation>只有在需要将数据库与其他程序一起使用时，这才是重要的。</translation>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation>KDBX 4.0（推荐）</translation>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation>KDBX 3.1</translation>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation>不变</translation>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>回合数太高</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>你正在对 Argon2 使用相当高的密钥转换回合数。
+
+如果仍执意使用此数量，你的数据库可能需要数小时或数天（甚至更长时间）才能打开！</translation>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation>了解，仍使用此数量</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>取消</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>回合数太低</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>你正对AES-KDF使用过低的密钥转换回合数。
+
+如果仍执意使用此数量，你的数据库可能会变得相当简单即能破解！</translation>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation>KDF不变</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation>无法使用新的KDF参数转换密钥; KDF不变。</translation>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation><numerusform> MiB</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation><numerusform>线程(s)</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation><numerusform>%1 毫秒</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation><numerusform>%1 秒</numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -951,91 +1349,112 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>根群组</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 数据库</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>所有文件</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>打开数据库</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>找不到文件！</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>无法打开数据库</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>文件在只读模式下打开。</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>打开 CSV 文件</translation>
+        <source>Add additional protection...</source>
+        <translation>添加额外保护......</translation>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>CSV 文件</translation>
+        <source>No encryption key added</source>
+        <translation>没有添加加密密钥</translation>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>所有文件 (*)</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation>您必须添加至少一个加密密钥，才能保护您的数据库！</translation>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>合并数据库</translation>
+        <source>No password set</source>
+        <translation>没有设置密码</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>打开 KeePass 1 数据库</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>警告！ 您尚未设置密码。强烈建议不要使用没有密码的数据库！
+
+您确定要在没有密码的情况下继续吗？</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1 数据库</translation>
+        <source>Unknown error</source>
+        <translation>未知错误</translation>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>关闭？</translation>
+        <source>Failed to change master key</source>
+        <translation>无法更改主密钥</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>正在编辑 &quot;%1&quot; 。
-仍然要放弃修改并且关闭吗？</translation>
+        <source>Database Name:</source>
+        <translation>数据库名称：</translation>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>保存修改？</translation>
+        <source>Description:</source>
+        <translation>描述：</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>&quot;%1&quot; 已被修改。
-要保存吗？</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 数据库</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>数据库写入失败</translation>
+        <source>All files</source>
+        <translation>所有文件</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>密码</translation>
+        <source>Open database</source>
+        <translation>打开数据库</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>数据库另存为</translation>
+        <source>CSV file</source>
+        <translation>CSV 文件</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>合并数据库</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>打开 KeePass 1 数据库</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 数据库</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1046,40 +1465,41 @@ Save changes?</source>
         <translation>写入 CSV 文件失败</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>新建数据库</translation>
+        <source>Database creation error</source>
+        <translation>数据库创建错误</translation>
     </message>
     <message>
-        <source>locked</source>
-        <translation>已锁定</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>创建的数据库没有密钥或KDF，拒绝保存
+这是一个错误，请向开发人员报告。</translation>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>锁定数据库</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation>数据库文件不存在或无法访问。</translation>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>不能锁定正在编辑的数据库。
-点击“取消”继续编辑，点击“确定”丢弃更改。</translation>
+        <source>Select CSV file</source>
+        <translation>选择CSV文件</translation>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>数据库已经更改。
-你想在锁定它之前保存修改吗？
-否则修改将会丢失。</translation>
+        <source>New Database</source>
+        <translation>新建数据库</translation>
     </message>
     <message>
-        <source>Disable safe saves?</source>
-        <translation>禁用安全保存？</translation>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [新建数据库]</translation>
     </message>
     <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未能多次保存数据库。 这可能是由保存文件锁定的文件同步服务引起的。
-禁用安全保存并重试？</translation>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [锁定]</translation>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
+        <translation>%1 [只读]</translation>
     </message>
 </context>
 <context>
@@ -1089,37 +1509,13 @@ Disable safe saves and try again?</source>
         <translation>搜索中...</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>更改主密码</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>删除项目？</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>你确定永久删除 &quot;%1&quot; 项目吗？</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>删除项目？</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>你确定永远删除 &quot;%1&quot; 项目吗？</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>移动项目到回收站？</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation>是否删除 &quot;%1&quot; 项目到回收站？</translation>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>移动项目到垃圾桶？</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation><numerusform>你确定要将 %n 个项目移到垃圾桶？</numerusform></translation>
@@ -1137,18 +1533,10 @@ Disable safe saves and try again?</source>
         <translation>记住我的选择</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>删除群组？</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>你确定永久删除 &quot;%1&quot; 群组吗？</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>无法计算主密码</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>没有当前的数据库。</translation>
     </message>
@@ -1183,10 +1571,6 @@ Do you want to merge your changes?</source>
 你想合并你的修改吗?</translation>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>在尝试自动载入此数据库时不能打开新的数据库文件。</translation>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>清空回收站？</translation>
     </message>
@@ -1194,88 +1578,107 @@ Do you want to merge your changes?</source>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>你确定要永久删除回收站中的所有内容？</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>生成 TOTP 令牌</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation><numerusform>你真的想删除 %n 个条目(s)吗？</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation><numerusform>删除项目(s)？</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation><numerusform>移动项目(s)到回收站？</numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>关闭</translation>
+        <source>File opened in read only mode.</source>
+        <translation>文件在只读模式下打开。</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>常规</translation>
+        <source>Lock Database?</source>
+        <translation>锁定数据库？</translation>
     </message>
     <message>
-        <source>Password</source>
-        <translation>密码</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation>您正在编辑一个项目。放弃更改和锁定？</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>网址</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot; 已被修改。
+要保存吗？</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>过期时间</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation>数据库已被修改
+保存更改？</translation>
     </message>
     <message>
-        <source>Username</source>
-        <translation>用户名</translation>
+        <source>Save changes?</source>
+        <translation>保存修改？</translation>
     </message>
     <message>
-        <source>Autotype</source>
-        <translation>自动填充</translation>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation>尝试自动重载时无法打开新的数据库文件
+错误：%1</translation>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>搜索</translation>
+        <source>Disable safe saves?</source>
+        <translation>禁用安全保存？</translation>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>附加属性</translation>
+        <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未能多次保存数据库。 这可能是由保存文件锁定的文件同步服务引起的。
+禁用安全保存并重试？</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>附件</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation>写入数据库失败
+%1</translation>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>备注</translation>
+        <source>Passwords</source>
+        <translation>密码</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>窗口</translation>
+        <source>Save database as</source>
+        <translation>数据库另存为</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>顺序</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 数据库</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>搜索</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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></translation>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>清除</translation>
+        <source>Delete group</source>
+        <translation>删除群组</translation>
     </message>
     <message>
-        <source>Never</source>
-        <translation>从不</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[受保护的内容]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>禁用</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>启用</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1349,22 +1752,10 @@ Do you want to merge your changes?</source>
         <translation>添加属性</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>确认删除</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>你确定要移除这个属性？</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[受保护的内容]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation>按显示查看或编辑</translation>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>明天</translation>
     </message>
@@ -1377,10 +1768,6 @@ Do you want to merge your changes?</source>
         <translation><numerusform>%n 月</numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 年</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation>是否应用生成的密码？</translation>
     </message>
@@ -1392,6 +1779,26 @@ Do you want to merge your changes?</source>
         <source>Entry updated successfully.</source>
         <translation>项目已成功更新。</translation>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation>项目有未保存的更改</translation>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation>添加属性 %1</translation>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation>[受保护的内容] 点击“揭示”来查看或编辑</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation><numerusform>%n 年(s)</numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1637,6 +2044,81 @@ Do you want to merge your changes?</source>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>表格</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>密码：</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1694,10 +2176,6 @@ Do you want to merge your changes?</source>
         <translation>无法获取网站图标</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>提示：你可以在 工具 &gt; 设置 &gt; 安全 中启用 Google 作为备选</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>图片</translation>
     </message>
@@ -1706,14 +2184,6 @@ Do you want to merge your changes?</source>
         <translation>所有文件</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>选择图片</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read icon</source>
-        <translation>无法读取图标</translation>
-    </message>
-    <message>
         <source>Custom icon already exists</source>
         <translation>已经存在自定义图标</translation>
     </message>
@@ -1722,8 +2192,36 @@ Do you want to merge your changes?</source>
         <translation>确认删除</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>这个图标被 %1 个条目使用，将会被默认图标替换。你确定要删除它吗？</translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation>自定义图标已成功下载</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>提示：您可以在工具&gt;设置&gt;安全性下启用DuckDuckGo作为后备</translation>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation>选择图像</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation><numerusform>已成功加载 %1 / %n 图标</numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation>没有加载图标</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation><numerusform>%n 图标已存在于数据库中</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation><numerusform>以下图标失败：</numerusform></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>此图标由 %n 个条目使用，并将替换为默认图标。 你确定你要删除吗？</numerusform></translation>
     </message>
 </context>
 <context>
@@ -1774,9 +2272,8 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation>- 副本</translation>
+        <source>%1 - Clone</source>
+        <translation>%1 - 复制</translation>
     </message>
 </context>
 <context>
@@ -1821,10 +2318,6 @@ This may cause the affected plugins to malfunction.</source>
         <translation><numerusform>你确定要删除％n个附件吗？</numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>确认删除</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>保存附件</translation>
     </message>
@@ -1860,9 +2353,13 @@ This may cause the affected plugins to malfunction.</source>
         <translation>无法打开附件：%1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation>确认删除</translation>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>无法打开文件：%1</translation>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1946,6 +2443,106 @@ This may cause the affected plugins to malfunction.</source>
         <source>Attachments</source>
         <translation>附件</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>是</translation>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation>TOTP 密码</translation>
+    </message>
+</context>
+<context>
+    <name>EntryPreviewWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>生成 TOTP 令牌</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>关闭</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>常规</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>用户名</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>密码</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>过期时间</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>网址</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>添加属性</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>附件</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>备注</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>自动填充</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>窗口</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>顺序</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>搜索</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>搜索</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>清除</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>从不</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[受保护的内容]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
+        <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>启用</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>禁用</translation>
+    </message>
+    <message>
+        <source>Share</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EntryView</name>
@@ -1984,6 +2581,19 @@ This may cause the affected plugins to malfunction.</source>
         <source>Recycle Bin</source>
         <translation>回收站</translation>
     </message>
+    <message>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation>[空]</translation>
+    </message>
+</context>
+<context>
+    <name>GroupModel</name>
+    <message>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>HostInstaller</name>
@@ -1997,61 +2607,6 @@ This may cause the affected plugins to malfunction.</source>
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>长度：</translation>
-    </message>
-    <message>
-        <source>Character Types</source>
-        <translation>字符类型</translation>
-    </message>
-    <message>
-        <source>Upper Case Letters</source>
-        <translation>大写字母</translation>
-    </message>
-    <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
-    </message>
-    <message>
-        <source>Lower Case Letters</source>
-        <translation>小写字母</translation>
-    </message>
-    <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
-    </message>
-    <message>
-        <source>Numbers</source>
-        <translation>数字</translation>
-    </message>
-    <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
-    </message>
-    <message>
-        <source>Special Characters</source>
-        <translation>特殊字符</translation>
-    </message>
-    <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
-    </message>
-    <message>
-        <source>Exclude look-alike characters</source>
-        <translation>排除相似的字符</translation>
-    </message>
-    <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>确保密码包含每一种字符</translation>
-    </message>
-    <message>
-        <source>Extended ASCII</source>
-        <translation>扩展 ASCII</translation>
-    </message>
-</context>
-<context>
     <name>KMessageWidget</name>
     <message>
         <source>&amp;Close</source>
@@ -2076,6 +2631,26 @@ This may cause the affected plugins to malfunction.</source>
         <source>Wrong key or database file is corrupt.</source>
         <translation>密钥错误或数据库损坏</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation>缺少数据库头</translation>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation>标题与哈希不匹配</translation>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>无效的标头ID大小</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>无效的标头字段长度</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>无效的标头数据长度</translation>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2235,10 +2810,6 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation>无效的暗文 uuid 长度</translation>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation>不支持的加密</translation>
     </message>
@@ -2291,6 +2862,18 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Unsupported KeePass 2 database version.</source>
         <translation>不支持的KeePass 2数据库版本。</translation>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation>无效密码uuid长度: %1(长度=%2)</translation>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation>无法解析 UUID: %1</translation>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2363,10 +2946,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>具有不同 uuid 的历史元素</translation>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation>无法解密条目字符串</translation>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation>找到重复的自定义属性</translation>
     </message>
@@ -2415,6 +2994,14 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation>无法解压缩二进制文件</translation>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation>XML错误:
+%1
+行 %2，列 %3</translation>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2578,28 +3165,130 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Invalid entry field type</source>
         <translation>无效的输入字段类型</translation>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation>无法寻求满足的内容</translation>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>单实例锁无效，正在重启实例</translation>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>无法创建锁定文件。 单实例模式已禁用。</translation>
+        <source>Import from</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>另一个 KeePassXC 实例已在运行</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>在测试加密函数时发生重大错误。</translation>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - 错误</translation>
+        <source>Key Component</source>
+        <translation>密钥组件</translation>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation>密钥组件描述</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>取消</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation>密钥组件集，单击以更改或删除</translation>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation>添加 %1</translation>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation>更改 %1</translation>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation>删除 %1</translation>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation>%1 设置，单击以更改或删除</translation>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>浏览</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>生成</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <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>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <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>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation>加载密钥文件 &apos;%1&apos; 时出错
+消息: %2</translation>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>密钥文件</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>所有文件</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>创建密钥文件...</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation>创建密钥文件时出错</translation>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation>无法创建密钥文件: %1</translation>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>选择密钥文件</translation>
     </message>
 </context>
 <context>
@@ -2613,10 +3302,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>最近的数据库(R)</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>导入</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation>帮助(H)</translation>
     </message>
@@ -2625,14 +3310,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>项目(N)</translation>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>将属性复制到剪贴板(R)</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation>基于时间的一次性密码</translation>
-    </message>
-    <message>
         <source>&amp;Groups</source>
         <translation>群组(G)</translation>
     </message>
@@ -2661,30 +3338,10 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>关闭数据库(C)</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>新建数据库(N)</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>从 KeePassX 数据库合并</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>新增项目(A)</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>浏览/编辑项目(V)</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>删除项目(D)</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>新增群组(A)</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>编辑群组(E)</translation>
     </message>
@@ -2697,14 +3354,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>数据库另存为(V)...</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>更改主密码(M)...</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>数据库设置(D)</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>数据库设置</translation>
     </message>
@@ -2713,10 +3362,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>复制项目(C)</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>查找(F)</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>复制用户名(U)</translation>
     </message>
@@ -2725,10 +3370,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>将用户名复制到剪贴板</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>复制密码(Y)</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>将密码复制到剪贴板</translation>
     </message>
@@ -2741,14 +3382,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>密码生成器</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation>执行自动输入(P)</translation>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>打开网址O)</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>锁定数据库(L)</translation>
     </message>
@@ -2781,22 +3414,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>导出为 CSV 文件(E)...</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>导入 KeePass 1 数据库...</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>导入 CSV 文件...</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>修复数据库(P)...</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>显示 TOTP 密码</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>设置 TOTP 密码...</translation>
     </message>
@@ -2817,14 +3434,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>访问配置文件出错 %1</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation>&lt;p&gt;您可能正在使用 KeePassHTTP 来连接浏览器插件。该功能目前已被弃用，并且在未来将会被移除。&lt;br&gt;请切换到 KeePassXC-Browser！ 如果在迁移中您需要帮助，请访问&lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;迁移指南&lt;/a&gt; （警告 %1/3）。&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>只读</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>设置</translation>
     </message>
@@ -2837,36 +3446,278 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>退出 KeePassXC</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 数据库</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>请触摸你 YubiKey 上的按键！</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>所有文件</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation>警告：您正在使用不稳定的KeePassXC版本！
+存在高风险的损坏，维护数据库的备份。
+此版本不适用于生产用途。</translation>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>打开数据库</translation>
+        <source>&amp;Donate</source>
+        <translation>&amp;捐助</translation>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>保存修复后的数据库</translation>
+        <source>Report a &amp;bug</source>
+        <translation>报告&amp;错误</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>数据库写入失败</translation>
+        <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>警告：您的Qt版本可能会导致KeePassXC与屏幕键盘而崩溃！
+我们建议您使用我们的下载页面上提供的AppImage。</translation>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>请触摸你 YubiKey 上的按键！</translation>
+        <source>&amp;Import</source>
+        <translation>&amp;导入</translation>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
-        <translation>警告：您正在使用不稳定的KeePassXC版本！
-存在高风险的损坏，维护数据库的备份。
-此版本不适用于生产用途。</translation>
+        <source>Copy att&amp;ribute...</source>
+        <translation>复制 att&amp;ribute...</translation>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation>TOTP...</translation>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation>&amp;新数据库...</translation>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation>创建一个新数据库</translation>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation>&amp;从数据库中合并...</translation>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation>从另一个KDBX数据库合并</translation>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation>&amp;新项目</translation>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation>添加新项目</translation>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation>&amp;编辑项目</translation>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation>查看或编辑项目</translation>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation>&amp;新群组</translation>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation>添加一个新群组</translation>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation>修改主密钥...</translation>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation>&amp;数据库设置...</translation>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation>复制 &amp;密码</translation>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation>执行和自动键入</translation>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation>打开 &amp;URL链接</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation>KeePass 1 数据库...</translation>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation>导入KeePass 1数据库</translation>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation>CSV文件...</translation>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation>导入CSV文件</translation>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation>显示 TOTP...</translation>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation>显示TOTP 二维码...</translation>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Merger</name>
+    <message>
+        <source>Creating missing %1 [%2]</source>
+        <translation>创建缺少 %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Relocating %1 [%2]</source>
+        <translation>重新定位 %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Overwriting %1 [%2]</source>
+        <translation>覆盖 %1 [%2]</translation>
+    </message>
+    <message>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation>从数据库 &quot;%1&quot; 合并的旧项目</translation>
+    </message>
+    <message>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation>为旧目标 %1 [%2]添加备份</translation>
+    </message>
+    <message>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation>为旧源 %1 添加备份 [%2]</translation>
+    </message>
+    <message>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation>在较新的源 %1 [%2]之上重新应用较旧的目标项目</translation>
+    </message>
+    <message>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation>在较新的目标 %1 [%2]之上重新应用较旧的源项目</translation>
+    </message>
+    <message>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation>从较新的源 %1 [%2]同步</translation>
+    </message>
+    <message>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation>从旧资源 %1 [%2]同步</translation>
+    </message>
+    <message>
+        <source>Deleting child %1 [%2]</source>
+        <translation>删除子项 %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation>删除孤立 %1 [%2]</translation>
+    </message>
+    <message>
+        <source>Changed deleted objects</source>
+        <translation>更改已删除的对象</translation>
+    </message>
+    <message>
+        <source>Adding missing icon %1</source>
+        <translation>添加缺少的图标 %1</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
+    <message>
+        <source>Create a new KeePassXC database...</source>
+        <translation>创建一个新的KeePassXC数据库...</translation>
+    </message>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>根群组</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
+    <message>
+        <source>WizardPage</source>
+        <translation>向导页</translation>
+    </message>
+    <message>
+        <source>En&amp;cryption Settings</source>
+        <translation>加密设置</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>您可以在此处调整数据库加密设置。 不用担心，您可以稍后在数据库设置中更改它们。</translation>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>高级设置</translation>
+    </message>
+    <message>
+        <source>Simple Settings</source>
+        <translation>简单设置</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
+    <message>
+        <source>Encryption Settings</source>
+        <translation>加密设置</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>您可以在此处调整数据库加密设置。 不用担心，您可以稍后在数据库设置中更改它们。</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
+    <message>
+        <source>Database Master Key</source>
+        <translation>数据库主密钥</translation>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
+        <translation>只有您知道的主密钥才能保护您的数据库。</translation>
+    </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMetaData</name>
+    <message>
+        <source>General Database Information</source>
+        <translation>一般的数据库信息</translation>
+    </message>
+    <message>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation>请填写新数据库的显示名称和可选说明：</translation>
     </message>
 </context>
 <context>
@@ -2969,125 +3820,34 @@ This version is not meant for production use.</source>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation>对话框</translation>
-    </message>
-    <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>通过 ChromelPass 或 PasslFox 访问数据库需要此设置</translation>
-    </message>
-    <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>启用 KeePassHTTP 服务</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>常规</translation>
-    </message>
-    <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>当请求凭证时显示通知(O)</translation>
-    </message>
-    <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>只返回特定网址的最佳匹配，而不是整个域名的所有条目。</translation>
-    </message>
-    <message>
-        <source>&amp;Return only best matching entries</source>
-        <translation>只返回最匹配的条目</translation>
-    </message>
-    <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>数据库锁定时请求解锁(Q)</translation>
-    </message>
-    <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation>仅返回具有相同协议 (http://, https://, ftp://, ...) 的条目</translation>
-    </message>
-    <message>
-        <source>&amp;Match URL schemes</source>
-        <translation>匹配 URL 协议(M)</translation>
-    </message>
-    <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>根据用户名排序匹配项(U)</translation>
-    </message>
-    <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>根据标题排序匹配项(M)</translation>
-    </message>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>移除所有激活数据库共享的加密密钥(E)</translation>
-    </message>
-    <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>从活动数据库的条目中移除已存储的所有权限(M)</translation>
-    </message>
-    <message>
-        <source>Password Generator</source>
-        <translation>密码生成器</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>高级</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>永远允许访问项目(A)</translation>
-    </message>
-    <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>永远允许更新项目(U)</translation>
-    </message>
-    <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>只有选定的数据库必须与一个客户端连接。</translation>
-    </message>
-    <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>在所有打开的数据库中查找匹配项目(H)</translation>
-    </message>
-    <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>不支持自动创建或更新字符串字段。</translation>
-    </message>
-    <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>返回以“KPH:”开头的高级字符串字段(R)</translation>
-    </message>
-    <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP 端口：</translation>
+        <source>Enter password:</source>
+        <translation>输入密码：</translation>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>默认端口：19455</translation>
+        <source>Confirm password:</source>
+        <translation>确认密码:</translation>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC 将监听 127.0.0.1 上的此端口</translation>
+        <source>Password</source>
+        <translation>密码</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;警告：&lt;/b&gt; 以下选项可能有危险！</translation>
+        <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;密码是保护数据库的主要方法。&lt;/p&gt;&lt;p&gt;良好的密码长且独特。 KeePassXC可以为您生成一个。&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;KeePassHTTP 已被弃用，并且在未来将会被移除。&lt;br&gt;请切换到 KeePassXC-Browser！如果在迁移中您需要帮助，请访问&lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;迁移指南&lt;/a&gt;。&lt;/p&gt;</translation>
+        <source>Password cannot be empty.</source>
+        <translation>密码不能为空。</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>无法绑定到特权端口</translation>
+        <source>Passwords do not match.</source>
+        <translation>密码不匹配。</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>无法绑定低于 1024 的特权端口 ！
-使用默认端口 19455</translation>
+        <source>Generate master password</source>
+        <translation>生成主密码</translation>
     </message>
 </context>
 <context>
@@ -3158,18 +3918,10 @@ Using default port 19455.</source>
         <translation>字符列表：</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>字数：</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>字符分隔符：</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>生成</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>复制</translation>
     </message>
@@ -3182,10 +3934,6 @@ Using default port 19455.</source>
         <translation>关闭</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>应用</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>熵：%1 比特</translation>
     </message>
@@ -3213,6 +3961,171 @@ Using default port 19455.</source>
         <comment>Password quality</comment>
         <translation>优秀</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation>扩展的ASCII</translation>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation>切换到高级模式</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>高级</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation>大写字母A到F</translation>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation>小写字母A至F</translation>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation>括弧</translation>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation>{[(</translation>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation>标点</translation>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation>.,:;</translation>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation>引号</translation>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation>&quot; &apos;</translation>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation>数学</translation>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation>&lt;*+!?=</translation>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation>破折号</translation>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation>\_|-/</translation>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation>语标符号</translation>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation>#$%&amp;&amp;@^`~</translation>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation>切换到简易模式</translation>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation>简易</translation>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation>从生成的密码中排除字符集</translation>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation>不包括：</translation>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation>将非十六进制字母添加到“不包含”列表中</translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation>十六进制</translation>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation>排除的字符： &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</translation>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation>字数：</translation>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation>再生</translation>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>删除</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>移除</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>禁用</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3233,34 +4146,18 @@ Using default port 19455.</source>
         <translation>无法解密消息</translation>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
-        <translation>超时或无法连接到KeePassXC</translation>
-    </message>
-    <message>
         <source>Action cancelled or denied</source>
         <translation>操作被取消或被拒绝</translation>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation>无法加密未找到的信息或公钥。 是否在KeePassXC中启用了Native Messaging？</translation>
-    </message>
-    <message>
         <source>KeePassXC association failed, try again</source>
         <translation>KeePassXC关联失败，请重试</translation>
     </message>
     <message>
-        <source>Key change was not successful</source>
-        <translation>密钥更改没有成功</translation>
-    </message>
-    <message>
         <source>Encryption key is not recognized</source>
         <translation>无法识别加密密钥</translation>
     </message>
     <message>
-        <source>No saved databases found</source>
-        <translation>找不到保存的数据库</translation>
-    </message>
-    <message>
         <source>Incorrect action</source>
         <translation>操作错误</translation>
     </message>
@@ -3386,10 +4283,6 @@ Using default port 19455.</source>
         <translation>插入密码以解锁%1: </translation>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation>无法加载密钥文件%1 : %2</translation>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3474,12 +4367,6 @@ Available commands:
         <translation>从设备读取发生错误</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>文件为空！
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation>格式不正确的字符串</translation>
     </message>
@@ -3488,30 +4375,6 @@ Available commands:
         <translation>缺少后引号</translation>
     </message>
     <message>
-        <source>AES: 256-bit</source>
-        <translation>AES：256位</translation>
-    </message>
-    <message>
-        <source>Twofish: 256-bit</source>
-        <translation>Twofish：256位</translation>
-    </message>
-    <message>
-        <source>ChaCha20: 256-bit</source>
-        <translation>ChaCha20：256位</translation>
-    </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2（推荐 KDBX 4）</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 4)</source>
-        <translation>AES-KDF（KDBX 4）</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 3.1)</source>
-        <translation>AES-KDF（KDBX 3.1）</translation>
-    </message>
-    <message>
         <source>Group</source>
         <translation>群组</translation>
     </message>
@@ -3540,10 +4403,6 @@ Available commands:
         <translation>创建</translation>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
-        <translation>传统浏览器集成</translation>
-    </message>
-    <message>
         <source>Browser Integration</source>
         <translation>浏览器配合</translation>
     </message>
@@ -3572,10 +4431,6 @@ Available commands:
         <translation>diceware密码短语的字数。</translation>
     </message>
     <message>
-        <source>count</source>
-        <translation>数</translation>
-    </message>
-    <message>
         <source>Wordlist for the diceware generator.
 [Default: EFF English]</source>
         <translation>diceware生成器的词表。
@@ -3586,28 +4441,441 @@ Available commands:
         <translation>生成一个新的随机密码。</translation>
     </message>
     <message>
-        <source>Length of the generated password.</source>
-        <translation>生成密码长度。</translation>
+        <source>Invalid value for password length %1.</source>
+        <translation>密码长度 %1 的值无效。</translation>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation>无法创建路径为 %1 的项目。</translation>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation>输入新项目的密码：</translation>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation>写入数据库失败 %1 。</translation>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
-        <translation>在生成的密码中使用小写字符。</translation>
+        <source>Successfully added entry %1.</source>
+        <translation>成功添加了项目 %1 。</translation>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
-        <translation>在生成的密码中使用大写字符。</translation>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation>将当前TOTP复制到剪贴板。</translation>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
-        <translation>在生成的密码中使用数字。</translation>
+        <source>Invalid timeout value %1.</source>
+        <translation>超时值 %1 无效。</translation>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
-        <translation>在生成的密码中使用特殊字符。</translation>
+        <source>Entry %1 not found.</source>
+        <translation>输入 %1 未找到。项目</translation>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
-        <translation>在生成的密码中使用扩展ASCII。</translation>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation>路径 %1 的项目没有设置TOTP。</translation>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation>项目的当前TOTP复制到剪贴板！</translation>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation>项目密码复制到剪贴板！</translation>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation><numerusform>在 %1 秒内清除剪贴板...</numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation>剪贴板已清除！</translation>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation>静默密码提示和其他辅助输出。</translation>
+    </message>
+    <message>
+        <source>count</source>
+        <comment>CLI parameter</comment>
+        <translation>数</translation>
+    </message>
+    <message>
+        <source>Invalid value for password length: %1</source>
+        <translation>密码长度的值无效：%1</translation>
+    </message>
+    <message>
+        <source>Could not find entry with path %1.</source>
+        <translation>找不到路径为 %1的项目。</translation>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation>不更改项目 %1的任何字段。</translation>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation>输入新密码进入：</translation>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation>写入数据库失败: %1</translation>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation>已成功编辑项目 %1。</translation>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation>长度 %1</translation>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation>熵 %1</translation>
+    </message>
+    <message>
+        <source>Log10 %1</source>
+        <translation>Log10 %1</translation>
+    </message>
+    <message>
+        <source>Multi-word extra bits %1</source>
+        <translation>多字加号位%1</translation>
+    </message>
+    <message>
+        <source>Type: Bruteforce</source>
+        <translation>类型：暴力</translation>
+    </message>
+    <message>
+        <source>Type: Dictionary</source>
+        <translation>类型：字典</translation>
+    </message>
+    <message>
+        <source>Type: Dict+Leet</source>
+        <translation>类型：字典+名单</translation>
+    </message>
+    <message>
+        <source>Type: User Words</source>
+        <translation>类型：用户词</translation>
+    </message>
+    <message>
+        <source>Type: User+Leet</source>
+        <translation>类型：用户 + 名单</translation>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation>类型：重复</translation>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation>类型：序列</translation>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation>类型：空间</translation>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation>类型：日期</translation>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation>类型：暴力破解(重复)</translation>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation>类型：字典(重复)</translation>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation>类型：字典+名单(重复)</translation>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation>类型：用户词(重复)</translation>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation>类型：用户词+名单(重复)</translation>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation>类型：重复（重复）</translation>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation>类型：序列（重复）</translation>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation>类型：空间（重复）</translation>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation>类型：日期（重复）</translation>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation>类型：未知%1</translation>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation>熵 %1 (%2)</translation>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation>*** 密码长度 (%1) != 部件长度之和(%2) ***</translation>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation>无法加载密钥文件 %1: %2</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation>文件 %1 不存在。</translation>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation>无法打开文件 %1。</translation>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation>读取数据库时出错：
+%1</translation>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation>解析数据库时出错：
+%1</translation>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation>生成密码的长度</translation>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation>使用小写字符</translation>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation>使用大写字符</translation>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation>使用数字。</translation>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation>使用特殊字符</translation>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation>使用扩展ASCII</translation>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation>排除字符集</translation>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation>字符</translation>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation>排除相似的字符</translation>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation>包括每个选定组中的字符</translation>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation>递归列出组的元素。</translation>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation>找不到组%1。</translation>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation>读取合并文件时出错：
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation>无法将数据库保存到文件 : %1</translation>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation>无法将数据库保存到文件: %1</translation>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation>成功回收了项目%1。</translation>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation>已成功删除项目%1。</translation>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation>显示当前项目的TOTP。</translation>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation>错误：未知属性%1。</translation>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation>没有为剪贴板操作定义程序</translation>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation>无法启动程序 %1</translation>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation>文件为空</translation>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation>%1: (row, col) %2,%3</translation>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation>AES：256位</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish：256位</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20：256位</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2（推荐 KDBX 4）</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF（KDBX 4）</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF（KDBX 3.1）</translation>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation>无效的设置</translation>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation>无效的密钥</translation>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>从数据库中删除条目。</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>要删除的条目的路径。</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>现有的单实例锁定文件无效。正在启动新实例。</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>无法创建锁定文件。 单实例模式已禁用。</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - 跨平台密码管理软件</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>将打开的密码数据库文件名(*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>自定义配置文件路径</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>数据库密钥文件</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>从标准输入读取数据库的密码</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation>父窗口句柄</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>另一个 KeePassXC 实例已在运行。</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>在测试加密函数时发生重大错误。</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - 错误</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
+        <translation>数据库密码：</translation>
     </message>
 </context>
 <context>
@@ -3645,12 +4913,98 @@ Available commands:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
+    <message>
+        <source>Agent connection failed.</source>
+        <translation>代理连接失败。</translation>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation>代理协议错误。</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation>没有代理运行，无法添加标识。</translation>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation>没有代理运行，无法删除标识。</translation>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation>代理拒绝了这个标识。可能的原因包括：</translation>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation>密钥已经添加。</translation>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation>代理不支持受限制的有效周期（检查选项）。</translation>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation>代理不支持确认请求（检查选项）。</translation>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation>查询帮助</translation>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation>搜索字词如下： [modifiers][field:][&quot;]term[&quot;]</translation>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation>每个搜索词必须匹配 (ie, logical AND)</translation>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation>修饰符</translation>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation>从结果中排除期限</translation>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation>确切地匹配期限</translation>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation>在术语中使用正则表达式</translation>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation>字段</translation>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation>术语通配符</translation>
+    </message>
     <message>
-        <source>Search...</source>
-        <translation>搜索……</translation>
+        <source>match anything</source>
+        <translation>匹配任何东西</translation>
     </message>
     <message>
+        <source>match one</source>
+        <translation>匹配一个</translation>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation>逻辑或</translation>
+    </message>
+    <message>
+        <source>Examples</source>
+        <translation>例子</translation>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
         <source>Search</source>
         <translation>搜索</translation>
     </message>
@@ -3659,314 +5013,316 @@ Available commands:
         <translation>清除</translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation>区分大小写</translation>
-    </message>
-    <message>
         <source>Limit search to selected group</source>
         <translation>在选中的群组中搜索</translation>
     </message>
+    <message>
+        <source>Search Help</source>
+        <translation>查询帮助</translation>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation>搜索(%1)...</translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation>区分大小写</translation>
+    </message>
 </context>
 <context>
-    <name>Service</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC: 新的密钥关联请求</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation>你已收到上述密钥的关联请求。
-如果你想允许它访问你的 KeePassXC 数据库，
-请为它提供一个唯一的名称来识别和接受它。</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC：覆盖现有的密钥吗？</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>一个共享的加密密钥，名为&quot;%1&quot;已存在。
-你想要覆盖它吗？</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC：更新条目</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>你想更新 %1-%2 中的信息吗？</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC：数据库被锁定！</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>激活的数据库被锁定 ！
-请解锁选定的数据库或选择另一已解锁的数据库。</translation>
+        <source>Key:</source>
+        <translation>密钥：</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC：从数据库中删除键</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation><numerusform>已成功从KeePassX / Http设置中删除％n加密密钥。</numerusform></translation>
+        <source>Generate</source>
+        <translation>生成</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC：未找到键</translation>
+        <source>Import</source>
+        <translation>导入</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>没有在 KeePassHttp 设置中找到共享加密密钥。</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC：设置不可用！</translation>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>当前数据库中没有 KeePassHttp 设置的条目。</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>正在删除存储的权限...</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>中断</translation>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC：已删除的权限</translation>
+        <source>Remove</source>
+        <translation>移除</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation><numerusform>已成功从％n个条目中删除权限。</numerusform></translation>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC： 未找到权限的条目！</translation>
+        <source>Status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>当前数据库中不包含具有权限的条目。</translation>
+        <source>Fingerprint</source>
+        <translation>指纹</translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
-        <translation>应用程序设置</translation>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>常规</translation>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>安全</translation>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>访问配置文件出错 %1</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>基础设置</translation>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>只启动一个 KeePassXC 实例</translation>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>记住最近的数据库</translation>
+        <source>All files</source>
+        <translation>所有文件</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>记住上次的密钥文件和安全模块</translation>
+        <source>Select path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>在启动时加载最近的数据库</translation>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>离开后自动保存</translation>
+        <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"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>修改后自动保存</translation>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>当外部修改时自动重新加载数据库</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>复制到剪贴板后最小化</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>在应用程序启动时窗口最小化</translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>新增项目时使用群组图标</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>不要因非数据的更改而将数据库标记为已修改 （比如增加群组）</translation>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
-        <translation>隐藏详细信息视图</translation>
+        <source>Never</source>
+        <translation>从不</translation>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>显示任务栏图标</translation>
+        <source>Always</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>将窗口最小化至任务栏</translation>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
-        <translation>退出时将窗口最小化至任务栏</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
-        <translation>暗色系统托盘图标</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>语言</translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>自动输入</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>使用条目标题匹配全局自动类型的窗口</translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>使用条目URL匹配全局自动类型的窗口</translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation>总在执行自动输入前询问</translation>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>自动输入全局快捷键</translation>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>自动输入延迟</translation>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation>毫秒</translation>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
-        <translation>启动</translation>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
-        <translation>文件管理</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation>安全保存数据库文件（可能与Dropbox等不兼容）</translation>
+        <source>Unknown share container type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
-        <translation>保存前备份数据库文件</translation>
+        <source>Overwriting signed share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
-        <translation>进入管理</translation>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>常规</translation>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
-        <translation>超时</translation>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>在多久后清除剪贴板</translation>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>秒</translation>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>在多久没有动作之后锁住数据库</translation>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>便利性</translation>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>系统锁定或盖子合上时锁定数据库</translation>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>在最小化窗口后锁定数据库</translation>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>TotpDialog</name>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>可见时不需要重复输入密码</translation>
+        <source>Timed Password</source>
+        <translation>动态密码</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>默认以明码显示密码</translation>
+        <source>000000</source>
+        <translation>000000</translation>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
-        <translation>在预览面板中隐藏密码</translation>
+        <source>Copy</source>
+        <translation>复制</translation>
     </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation><numerusform>以&lt;b&gt;%n&lt;/b&gt;秒到期</numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
     <message>
-        <source>Hide entry notes by default</source>
-        <translation>默认情况下隐藏条目备注</translation>
+        <source>Copy</source>
+        <translation>复制</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>隐私</translation>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation>注意：这些TOTP设置是自定义的，可能无法与其他验证器一起使用。</translation>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>使用 Google 作为下载网站图标时的备选</translation>
+        <source>There was an error creating the QR code.</source>
+        <translation>创建二维码时出错。</translation>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
-        <translation>执行自动类型后重新锁定先前锁定的数据库</translation>
+        <source>Closing in %1 seconds.</source>
+        <translation>在 %1 秒内关闭。</translation>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation>设置定时一次性密码</translation>
@@ -3988,59 +5344,84 @@ Please unlock the selected database or choose another one which is unlocked.</so
         <translation>使用自定义设置</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>注意：除非你知道自己在做什么，否则不要更改这些设置。</translation>
+        <source>Custom Settings</source>
+        <translation>自定义设置</translation>
     </message>
     <message>
         <source>Time step:</source>
         <translation>时间步进：</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8 位数字</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>秒</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>口令长度：</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6 位数字</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>口令长度：</translation>
+        <source>7 digits</source>
+        <translation>7位数</translation>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation>秒</translation>
+        <source>8 digits</source>
+        <translation>8 位数字</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>动态密码</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>复制</translation>
+        <source>Close</source>
+        <translation>关闭</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>过期时间</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>秒</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>解锁数据库</translation>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4075,42 +5456,26 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
 </context>
 <context>
-    <name>main</name>
-    <message>
-        <source>Remove an entry from the database.</source>
-        <translation>从数据库中删除条目。</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>数据库路径</translation>
-    </message>
-    <message>
-        <source>Path of the entry to remove.</source>
-        <translation>要删除的条目的路径。</translation>
-    </message>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - 跨平台密码管理软件</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>将打开的密码数据库文件名(*.kdbx)</translation>
+        <source>Refresh</source>
+        <translation>刷新</translation>
     </message>
     <message>
-        <source>path to a custom config file</source>
-        <translation>自定义配置文件路径</translation>
+        <source>YubiKey Challenge-Response</source>
+        <translation>YubiKey挑战 - 回应</translation>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>数据库密钥文件</translation>
+        <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>&lt;p&gt;如果您拥有&lt;a href=&quot;https://www.yubico.com/&quot;&gt;YubiKey&lt;/a&gt;，则可以使用它来提高安全性。&lt;/p&gt;&lt;p&gt;YubiKey要求将其中一个插槽编程为&lt;a href=&quot;https://www.yubico.com/products/services-software/personalization-tools/challenge-response/&quot;&gt;HMAC-SHA1挑战-回应&lt;/a&gt;。&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>从标准输入读取数据库的密码</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation>没有检测到YubiKey，请确保已插入。</translation>
     </message>
     <message>
-        <source>Parent window handle</source>
-        <translation>父窗口句柄</translation>
+        <source>No YubiKey inserted.</source>
+        <translation>没有插入YubiKey。</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_zh_TW.ts b/share/translations/keepassx_zh_TW.ts
index a3ccb807f..5b699bf84 100644
--- a/share/translations/keepassx_zh_TW.ts
+++ b/share/translations/keepassx_zh_TW.ts
@@ -38,12 +38,6 @@
         <translation>複製到剪貼簿</translation>
     </message>
     <message>
-        <source>Version %1
-</source>
-        <translation>版本 %1
-</translation>
-    </message>
-    <message>
         <source>Revision: %1</source>
         <translation>修訂：%1</translation>
     </message>
@@ -76,34 +70,48 @@ Kernel: %3 %4</source>
         <translation>KeePassXC 團隊特別鳴謝 debfx 開發了原本的 KeePassX</translation>
     </message>
     <message>
-        <source>Build Type: %1
-</source>
-        <translation>建置型態: %1</translation>
+        <source>Version %1</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AccessControlDialog</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP 存取確認</translation>
+        <source>Build Type: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember this decision</source>
-        <translation>記住此決定</translation>
+        <source>Auto-Type</source>
+        <translation>自動輸入</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>允許</translation>
+        <source>Browser Integration</source>
+        <translation>瀏覽器整合</translation>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>禁止</translation>
+        <source>SSH Agent</source>
+        <translation>SSH 代理</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>%1 要求存取下列項目的密碼。
-請選擇是否允許存取。</translation>
+        <source>YubiKey</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TouchID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (signed and unsigned sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only signed sharing)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare (only unsigned sharing)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -112,6 +120,277 @@ Please select whether you want to allow access.</source>
         <source>Enable SSH Agent (requires restart)</source>
         <translation>啟用 SSH 代理 (需要重新啟動)</translation>
     </message>
+    <message>
+        <source>Use OpenSSH for Windows instead of Pageant</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>應用程式設定</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>一般</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>安全性</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>設定檔存取錯誤：%1</translation>
+    </message>
+    <message>
+        <source>Icon only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text beside icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Text under icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Follow style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>基本設定</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>啟動</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>只能啟動單一 KeePassXC 程式</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>記住最近的資料庫</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>記住最近的金鑰檔案與安全加密狗</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>啟動時載入之前的資料庫</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>程式啟動時視窗最小化</translation>
+    </message>
+    <message>
+        <source>File Management</source>
+        <translation>檔案管理</translation>
+    </message>
+    <message>
+        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Backup database file before saving</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>修改後，自動儲存</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>離開時，自動儲存</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>未變更資料時（例如：擴展群組時）不要將資料庫標記為已修改</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>當有外部修改時自動重新載入資料庫</translation>
+    </message>
+    <message>
+        <source>Entry Management</source>
+        <translation>項目管理</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>新增項目時使用群組圖示</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>在複製到剪貼簿時最小化</translation>
+    </message>
+    <message>
+        <source>Hide the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>一般</translation>
+    </message>
+    <message>
+        <source>Hide toolbar (icons)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize instead of app exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>顯示工作列圖示</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>深色系統列圖示</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>將視窗最小化至工作列</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>語言</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>自動輸入</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>使用項目標題來匹配全域自動輸入的視窗</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>使用項目 URL 來匹配全域自動輸入的視窗</translation>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>在執行自動輸入前始終詢問</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>全域自動輸入快捷鍵</translation>
+    </message>
+    <message>
+        <source>Auto-Type typing delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation> 毫秒</translation>
+    </message>
+    <message>
+        <source>Auto-Type start delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include pre-releases when checking for updates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Movable toolbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Button style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ApplicationSettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>超時</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>多久後清除剪貼簿</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> 秒</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>多久沒有動作之後鎖定資料庫</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget TouchID after inactivity of</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>便利</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>當工作階段鎖定或蓋上螢幕時鎖定資料庫</translation>
+    </message>
+    <message>
+        <source>Forget TouchID when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>最小化視窗後鎖定資料庫</translation>
+    </message>
+    <message>
+        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>顯示密碼時不需要重複輸入密碼</translation>
+    </message>
+    <message>
+        <source>Don&apos;t hide passwords when editing them</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t use placeholder for empty password fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide passwords in the entry preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>預設隱藏項目備註</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>隱私</translation>
+    </message>
+    <message>
+        <source>Use DuckDuckGo as fallback for downloading website icons</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoType</name>
@@ -215,6 +494,26 @@ Please select whether you want to allow access.</source>
     </message>
 </context>
 <context>
+    <name>BrowserEntrySaveDialog</name>
+    <message>
+        <source>KeePassXC-Browser Save Entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>取消</translation>
+    </message>
+    <message>
+        <source>You have multiple databases open.
+Please select the correct database for saving credentials.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>BrowserOptionDialog</name>
     <message>
         <source>Dialog</source>
@@ -288,14 +587,6 @@ Please select whether you want to allow access.</source>
         <translation>依使用者名稱排序符合認證 (&amp;U)</translation>
     </message>
     <message>
-        <source>&amp;Disconnect all browsers</source>
-        <translation>與所有瀏覽器中斷連線 (&amp;D)</translation>
-    </message>
-    <message>
-        <source>Forget all remembered &amp;permissions</source>
-        <translation>取消所有先前記住的權限 (&amp;P)</translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation>進階</translation>
     </message>
@@ -361,19 +652,36 @@ Please select whether you want to allow access.</source>
         <translation>&lt;b&gt;警告：&lt;/b&gt;下列選項可能極具風險！</translation>
     </message>
     <message>
-        <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation>可執行檔 (* .exe);;所有檔案 (*)</translation>
+        <source>Select custom proxy location</source>
+        <translation>選擇自訂代理位置</translation>
+    </message>
+    <message>
+        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Executable Files (*)</source>
-        <translation>可執行檔 (*)</translation>
+        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Select custom proxy location</source>
-        <translation>選擇自訂代理位置</translation>
+        <source>&amp;Tor Browser</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
+        <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: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not ask permission for HTTP &amp;Basic Auth</source>
+        <extracomment>An extra HTTP Basic Auth setting</extracomment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -416,152 +724,43 @@ Do you want to overwrite it?</source>
         <translation>是否要更新 %1 到 %2 的資訊？</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC：資料庫已鎖定！</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>目前的資料庫已鎖定！
-請解鎖所選的資料庫或選擇其他已解鎖的資料庫。</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC：設定不可用！</translation>
-    </message>
-    <message>
-        <source>The active database does not contain a settings entry.</source>
-        <translation>目前的資料庫中沒有帶有設定的項目。</translation>
-    </message>
-    <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC：找不到金鑰</translation>
-    </message>
-    <message>
-        <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation>KeePassXC 設定中找不到共享加密金鑰。</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC：從資料庫中移除金鑰</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation><numerusform>成功從 KeePassXC 移除 %n 個加密金鑰。</numerusform></translation>
-    </message>
-    <message>
-        <source>Removing stored permissions…</source>
-        <translation>正在移除所有已儲存的權限……</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>中止</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC：已移除權限</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entry(s).</source>
-        <translation><numerusform>成功從 %n 個項目中移除權限。</numerusform></translation>
-    </message>
-    <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC：找不到帶有權限的項目！</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>目前的資料庫中沒有帶有權限的項目。</translation>
-    </message>
-</context>
-<context>
-    <name>ChangeMasterKeyWidget</name>
-    <message>
-        <source>Password</source>
-        <translation>密碼</translation>
-    </message>
-    <message>
-        <source>Enter password:</source>
-        <translation>輸入密碼：</translation>
-    </message>
-    <message>
-        <source>Repeat password:</source>
-        <translation>再次輸入密碼：</translation>
-    </message>
-    <message>
-        <source>&amp;Key file</source>
-        <translation>金鑰檔案 (&amp;K)</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation>瀏覽</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>建立</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>挑戰回應</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>重新整理</translation>
-    </message>
-    <message>
-        <source>Key files</source>
-        <translation>金鑰檔案</translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation>所有檔案</translation>
-    </message>
-    <message>
-        <source>Create Key File...</source>
-        <translation>建立金鑰檔案……</translation>
-    </message>
-    <message>
-        <source>Unable to create Key File : </source>
-        <translation>無法建立金鑰檔案： </translation>
-    </message>
-    <message>
-        <source>Select a key file</source>
-        <translation>選擇金鑰檔案</translation>
+        <source>Converting attributes to custom data…</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty password</source>
-        <translation>清空密碼</translation>
+        <source>KeePassXC: Converted KeePassHTTP attributes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you really want to use an empty string as password?</source>
-        <translation>真的要使用空白密碼？</translation>
+        <source>Successfully converted attributes from %1 entry(s).
+Moved %2 keys to custom data.</source>
+        <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Different passwords supplied.</source>
-        <translation>填寫的密碼不一致。</translation>
+    <message numerus="yes">
+        <source>Successfully moved %n keys to custom data.</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Failed to set %1 as the Key file:
-%2</source>
-        <translation>無法將 %1 設為金鑰檔案：
-%2</translation>
+        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Legacy key file format</source>
-        <translation>舊式金鑰檔案格式</translation>
+        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
+        <translation type="unfinished"/>
     </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>
+        <source>KeePassXC: Legacy browser integration settings detected</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>挑戰主金鑰失敗：沒有插入 YubiKey</translation>
+        <source>Legacy browser integration settings have been detected.
+Do you want to upgrade the settings to the latest standard?
+This is necessary to maintain compatibility with the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -642,14 +841,6 @@ Please consider generating a new key file.</source>
         <translation>不在 CSV 檔案內</translation>
     </message>
     <message>
-        <source>Empty fieldname </source>
-        <translation>清空檔名 </translation>
-    </message>
-    <message>
-        <source>column </source>
-        <translation>列 </translation>
-    </message>
-    <message>
         <source>Imported from CSV file</source>
         <translation>已從 CSV 檔匯入</translation>
     </message>
@@ -658,48 +849,84 @@ Please consider generating a new key file.</source>
         <translation>原始資料： </translation>
     </message>
     <message>
-        <source>Error(s) detected in CSV file !</source>
-        <translation>CSV 檔中檢測到錯誤！</translation>
+        <source>Error</source>
+        <translation>錯誤</translation>
     </message>
     <message>
-        <source> more messages skipped]</source>
-        <translation> 等訊息已跳過]</translation>
+        <source>Empty fieldname %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>錯誤</translation>
+        <source>column %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV import: writer has errors:
-</source>
-        <translation>CSV 匯入：寫入器錯誤：
-</translation>
+        <source>Error(s) detected in CSV file!</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>CsvImportWizard</name>
-    <message>
-        <source>Error</source>
-        <translation>錯誤</translation>
+    <message numerus="yes">
+        <source>[%n more message(s) skipped]</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>無法計算主金鑰</translation>
+        <source>CSV import: writer has errors:
+%1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
-        <source>%n byte(s), </source>
-        <translation><numerusform>%n 位元組，</numerusform></translation>
+        <source>%n column(s)</source>
+        <translation><numerusform>%n 列，</numerusform></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3</source>
+        <comment>file info: bytes, rows, columns</comment>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <source>%n row(s), </source>
-        <translation><numerusform>%n 行，</numerusform></translation>
+        <source>%n byte(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <source>%n column(s)</source>
-        <translation><numerusform>%n 列，</numerusform></translation>
+        <source>%n row(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Database</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group name</comment>
+        <translation>根</translation>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not save, database has no file name.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File cannot be written as it is opened in read-only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenDialog</name>
+    <message>
+        <source>Unlock Database - KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -729,14 +956,6 @@ Please consider generating a new key file.</source>
         <translation>挑戰回應：</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>無法開啟資料庫。</translation>
-    </message>
-    <message>
-        <source>Can&apos;t open key file</source>
-        <translation>無法開啟金鑰檔案</translation>
-    </message>
-    <message>
         <source>Legacy key file format</source>
         <translation>舊式金鑰檔案格式</translation>
     </message>
@@ -765,104 +984,168 @@ Please consider generating a new key file.</source>
         <source>Select key file</source>
         <translation>選擇金鑰檔案</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseRepairWidget</name>
     <message>
-        <source>Repair database</source>
-        <translation>修復資料庫</translation>
+        <source>TouchID for quick unlock</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Error</source>
-        <translation>錯誤</translation>
+        <source>Unable to open the database:
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t open key file</source>
-        <translation>無法開啟金鑰檔案</translation>
+        <source>Can't open key file:
+%1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingWidgetMetaData</name>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>無法開啟資料庫。</translation>
+        <source>Passwords</source>
+        <translation>密碼</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsDialog</name>
+    <message>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>一般</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>資料庫正常開啟。什麼都不做。</translation>
+        <source>Security</source>
+        <translation>安全性</translation>
     </message>
     <message>
-        <source>Success</source>
-        <translation>成功</translation>
+        <source>Master Key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The database has been successfully repaired
-You can now save it.</source>
-        <translation>資料庫已成功修復，你現在可以直接儲存。</translation>
+        <source>Encryption Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to repair the database.</source>
-        <translation>無法開啟資料庫</translation>
+        <source>Browser Integration</source>
+        <translation>瀏覽器整合</translation>
     </message>
 </context>
 <context>
-    <name>DatabaseSettingsWidget</name>
+    <name>DatabaseSettingsWidgetBrowser</name>
     <message>
-        <source>General</source>
-        <translation>一般</translation>
+        <source>KeePassXC-Browser settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Encryption</source>
-        <translation>加密</translation>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>與所有瀏覽器中斷連線 (&amp;D)</translation>
     </message>
     <message>
-        <source>Number of rounds too high</source>
-        <comment>Key transformation rounds</comment>
-        <translation>回合數太高</translation>
+        <source>Forg&amp;et all site-specific settings on entries</source>
+        <translation type="unfinished"/>
     </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>你正在對 Argon2 使用相當高的金鑰轉換回合數。
-
-如果仍執意使用此數量，你的資料庫可能需要花費數小時、數天、或是更久的時間才能打開！</translation>
+        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Understood, keep number</source>
-        <translation>了解，仍使用此數量</translation>
+        <source>Stored keys</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation>取消</translation>
+        <source>Remove</source>
+        <translation>移除</translation>
     </message>
     <message>
-        <source>Number of rounds too low</source>
-        <comment>Key transformation rounds</comment>
-        <translation>回合數太低</translation>
+        <source>Delete the selected key?</source>
+        <translation type="unfinished"/>
     </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>你正對 AES-KDF 使用過低的金鑰轉換回合數。
-
-如果仍執意使用此數量，你的資料庫可能會變得相當簡單即能破解！</translation>
+        <source>Do you really want to delete the selected key?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KDF unchanged</source>
-        <translation>KDF 不變</translation>
+        <source>Key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
-        <translation>無法用新的 KDF 參數轉換金鑰；KDF 不變。</translation>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable Browser Integration to access these settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to disconnect all browsers?
+This may prevent connection to the browser plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC：找不到金鑰</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC：從資料庫中移除金鑰</translation>
     </message>
     <message numerus="yes">
-        <source> MiB</source>
-        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
-        <translation><numerusform> MiB</numerusform></translation>
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Forget all site-specific settings on entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want forget all site-specific settings on every entry?
+Permissions to access entries will be revoked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>正在移除所有已儲存的權限……</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>中止</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC：已移除權限</translation>
     </message>
     <message numerus="yes">
-        <source> thread(s)</source>
-        <comment>Threads for parallel execution (KDF settings)</comment>
-        <translation><numerusform> 線程</numerusform></translation>
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC：找不到帶有權限的項目！</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>目前的資料庫中沒有帶有權限的項目。</translation>
+    </message>
+    <message>
+        <source>Move KeePassHTTP attributes to custom data</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
     </message>
 </context>
 <context>
@@ -899,6 +1182,113 @@ If you keep this number, your database may be too easy to crack!</source>
         <source>Parallelism:</source>
         <translation>平行運算：</translation>
     </message>
+    <message>
+        <source>Decryption Time:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>?? s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>100 ms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>5 s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Higher values offer more protection, but opening the database will take longer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is only important if you need to use your database with other programs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 4.0 (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDBX 3.1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>unchanged</source>
+        <comment>Database decryption time is unchanged</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>回合數太高</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>你正在對 Argon2 使用相當高的金鑰轉換回合數。
+
+如果仍執意使用此數量，你的資料庫可能需要花費數小時、數天、或是更久的時間才能打開！</translation>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation>了解，仍使用此數量</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>取消</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>回合數太低</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>你正對 AES-KDF 使用過低的金鑰轉換回合數。
+
+如果仍執意使用此數量，你的資料庫可能會變得相當簡單即能破解！</translation>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation>KDF 不變</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation>無法用新的 KDF 參數轉換金鑰；KDF 不變。</translation>
+    </message>
+    <message numerus="yes">
+        <source> MiB</source>
+        <comment>Abbreviation for Mebibytes (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source> thread(s)</source>
+        <comment>Threads for parallel execution (KDF settings)</comment>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 ms</source>
+        <comment>milliseconds</comment>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%1 s</source>
+        <comment>seconds</comment>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
@@ -948,91 +1338,110 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetKeeShare</name>
     <message>
-        <source>Root</source>
-        <comment>Root group</comment>
-        <translation>根</translation>
+        <source>Sharing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 資料庫</translation>
+        <source>Breadcrumb</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>所有檔案</translation>
+        <source>Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>開啟資料庫</translation>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>找不到檔案！</translation>
+        <source>Last Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>無法開啟資料庫。</translation>
+        <source>Certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>已將檔案以唯讀模式開啟。</translation>
+        <source> &gt; </source>
+        <comment>Breadcrumb separator</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMasterKey</name>
     <message>
-        <source>Open CSV file</source>
-        <translation>開啟 CSV 檔</translation>
+        <source>Add additional protection...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>CSV 檔案</translation>
+        <source>No encryption key added</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>所有檔案 (*)</translation>
+        <source>You must add at least one encryption key to secure your database!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>合併資料庫</translation>
+        <source>No password set</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>開啟 KeePass 1 資料庫</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 type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1 資料庫</translation>
+        <source>Unknown error</source>
+        <translation>未知的錯誤</translation>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>關閉？</translation>
+        <source>Failed to change master key</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetMetaDataSimple</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>「%1」 正在編輯模式中。
-是否要捨棄變更並關閉？</translation>
+        <source>Database Name:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>儲存修改？</translation>
+        <source>Description:</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
-        <translation>「%1」已修改。
-儲存變更？</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 資料庫</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>寫入資料庫失敗。</translation>
+        <source>All files</source>
+        <translation>所有檔案</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>密碼</translation>
+        <source>Open database</source>
+        <translation>開啟資料庫</translation>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>資料庫另存為</translation>
+        <source>CSV file</source>
+        <translation>CSV 檔案</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>合併資料庫</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>開啟 KeePass 1 資料庫</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 資料庫</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1043,38 +1452,39 @@ Save changes?</source>
         <translation>寫入 CSV 檔案失敗。</translation>
     </message>
     <message>
-        <source>New database</source>
-        <translation>新的資料庫</translation>
+        <source>Database creation error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>locked</source>
-        <translation>已鎖定</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 type="unfinished"/>
     </message>
     <message>
-        <source>Lock database</source>
-        <translation>鎖定資料庫</translation>
+        <source>The database file does not exist or is not accessible.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation>目前正在編輯中，所以無法鎖定資料庫。
-請按取消以完成修改或捨棄修改。</translation>
+        <source>Select CSV file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation>此資料庫已修改。
-要在鎖定之前儲存資料庫？
-不然則會遺失所有修改。</translation>
+        <source>New Database</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disable safe saves?</source>
-        <translation>關閉安全存檔?</translation>
+        <source>%1 [New Database]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
     </message>
     <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>
+        <source>%1 [Locked]</source>
+        <comment>Database tab name modifier</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 [Read-only]</source>
+        <comment>Database tab name modifier</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1085,37 +1495,13 @@ Disable safe saves and try again?</source>
         <translation>搜尋中……</translation>
     </message>
     <message>
-        <source>Change master key</source>
-        <translation>變更主金鑰</translation>
-    </message>
-    <message>
-        <source>Delete entry?</source>
-        <translation>刪除項目？</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
         <translation>真的要永久刪除「%1」？</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>刪除項目？</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>真的要永久刪除 %1 個項目？</translation>
-    </message>
-    <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>將項目移到回收桶？</translation>
-    </message>
-    <message>
         <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
         <translation>真的要將「%1」移到回收桶？</translation>
     </message>
-    <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>將項目移到回收桶？</translation>
-    </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
         <translation><numerusform>真的要將 %n 個項目移到回收桶？</numerusform></translation>
@@ -1133,18 +1519,10 @@ Disable safe saves and try again?</source>
         <translation>記住我的選擇</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>刪除群組？</translation>
-    </message>
-    <message>
         <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation>真的要永遠刪除「%1」群組？</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>無法計算主金鑰</translation>
-    </message>
-    <message>
         <source>No current database.</source>
         <translation>無目前資料庫。</translation>
     </message>
@@ -1179,10 +1557,6 @@ Do you want to merge your changes?</source>
 合併變更？</translation>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>自動重新讀取此資料庫時，無法開啟新資料庫檔案。</translation>
-    </message>
-    <message>
         <source>Empty recycle bin?</source>
         <translation>清空回收桶？</translation>
     </message>
@@ -1190,88 +1564,103 @@ Do you want to merge your changes?</source>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation>確定要永久刪除回收桶內的項目？</translation>
     </message>
-</context>
-<context>
-    <name>DetailsWidget</name>
-    <message>
-        <source>Generate TOTP Token</source>
-        <translation>產生 TOTP Token</translation>
+    <message numerus="yes">
+        <source>Do you really want to delete %n entry(s) for good?</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Delete entry(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Move entry(s) to recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>關閉</translation>
+        <source>File opened in read only mode.</source>
+        <translation>已將檔案以唯讀模式開啟。</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>一般</translation>
+        <source>Lock Database?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password</source>
-        <translation>密碼</translation>
+        <source>You are editing an entry. Discard changes and lock anyway?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>URL</source>
-        <translation>網址</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>「%1」已修改。
+儲存變更？</translation>
     </message>
     <message>
-        <source>Expiration</source>
-        <translation>過期</translation>
+        <source>Database was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Username</source>
-        <translation>使用者名稱</translation>
+        <source>Save changes?</source>
+        <translation>儲存修改？</translation>
     </message>
     <message>
-        <source>Autotype</source>
-        <translation>自動輸入</translation>
+        <source>Could not open the new database file while attempting to autoreload.
+Error: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searching</source>
-        <translation>搜尋中</translation>
+        <source>Disable safe saves?</source>
+        <translation>關閉安全存檔?</translation>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation>屬性</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>附件</translation>
+        <source>Writing the database failed.
+%1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes</source>
-        <translation>附註</translation>
+        <source>Passwords</source>
+        <translation>密碼</translation>
     </message>
     <message>
-        <source>Window</source>
-        <translation>視窗</translation>
+        <source>Save database as</source>
+        <translation>資料庫另存為</translation>
     </message>
     <message>
-        <source>Sequence</source>
-        <translation>序列</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 資料庫</translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation>搜尋</translation>
+        <source>Replace references to entry?</source>
+        <translation type="unfinished"/>
+    </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></translation>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>清除</translation>
+        <source>Delete group</source>
+        <translation>刪除群組</translation>
     </message>
     <message>
-        <source>Never</source>
-        <translation>從不</translation>
+        <source>Move group to recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[被保護]</translation>
+        <source>Do you really want to move the group &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation>停用</translation>
+        <source>Successfully merged the database files.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>啟用</translation>
+        <source>Database was not modified by merge operation.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1345,22 +1734,10 @@ Do you want to merge your changes?</source>
         <translation>新的屬性</translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>確認移除</translation>
-    </message>
-    <message>
         <source>Are you sure you want to remove this attribute?</source>
         <translation>確定要移除此屬性？</translation>
     </message>
     <message>
-        <source>[PROTECTED]</source>
-        <translation>[被保護]</translation>
-    </message>
-    <message>
-        <source>Press reveal to view or edit</source>
-        <translation>請按「揭示」以檢視或編輯</translation>
-    </message>
-    <message>
         <source>Tomorrow</source>
         <translation>明天</translation>
     </message>
@@ -1373,10 +1750,6 @@ Do you want to merge your changes?</source>
         <translation><numerusform>%n 個月</numerusform></translation>
     </message>
     <message>
-        <source>1 year</source>
-        <translation>1 年</translation>
-    </message>
-    <message>
         <source>Apply generated password?</source>
         <translation>使用產生的密碼？</translation>
     </message>
@@ -1388,6 +1761,26 @@ Do you want to merge your changes?</source>
         <source>Entry updated successfully.</source>
         <translation>項目已成功更新。</translation>
     </message>
+    <message>
+        <source>Entry has unsaved changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>New attribute %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED] Press reveal to view or edit</source>
+        <translation>[受保護的內容] 請按「揭示」以檢視或編輯</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Removal</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -1633,6 +2026,81 @@ Do you want to merge your changes?</source>
     </message>
 </context>
 <context>
+    <name>EditGroupWidgetKeeShare</name>
+    <message>
+        <source>Form</source>
+        <translation>表單</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>密碼：</translation>
+    </message>
+    <message>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import from path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Export to path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Synchronize with path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Your KeePassXC version does not support sharing your container type. Please use %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database sharing is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database export is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database import is disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare unsigned container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeeShare signed container</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select export target</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select import/export file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
@@ -1690,10 +2158,6 @@ Do you want to merge your changes?</source>
         <translation>無法擷取圖示。</translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>提示：可以啟用 Google 當作備案。選項請至 工具&gt;設定&gt;安全性</translation>
-    </message>
-    <message>
         <source>Images</source>
         <translation>圖片</translation>
     </message>
@@ -1702,14 +2166,6 @@ Do you want to merge your changes?</source>
         <translation>所有檔案</translation>
     </message>
     <message>
-        <source>Select Image</source>
-        <translation>選擇圖片</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read icon</source>
-        <translation>無法讀取圖示</translation>
-    </message>
-    <message>
         <source>Custom icon already exists</source>
         <translation>自訂圖示已經存在</translation>
     </message>
@@ -1718,8 +2174,36 @@ Do you want to merge your changes?</source>
         <translation>確認刪除</translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>有 %1 個項目使用此圖示，並將以預設圖示取代。確定要刪除圖示？</translation>
+        <source>Custom icon successfully downloaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select Image(s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully loaded %1 of %n icon(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>No icons were loaded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>%n icon(s) already exist in the database</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>The following icon(s) failed:</source>
+        <translation type="unfinished"><numerusform></numerusform></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 type="unfinished"><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1769,9 +2253,8 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>Entry</name>
     <message>
-        <source> - Clone</source>
-        <comment>Suffix added to cloned entries</comment>
-        <translation> - 複製</translation>
+        <source>%1 - Clone</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1816,10 +2299,6 @@ This may cause the affected plugins to malfunction.</source>
         <translation><numerusform>確定移除 %n 個附件？</numerusform></translation>
     </message>
     <message>
-        <source>Confirm Remove</source>
-        <translation>確認移除</translation>
-    </message>
-    <message>
         <source>Save attachments</source>
         <translation>儲存附件</translation>
     </message>
@@ -1856,10 +2335,13 @@ This may cause the affected plugins to malfunction.</source>
 %1</translation>
     </message>
     <message>
-        <source>Unable to open files:
+        <source>Confirm remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Unable to open file(s):
 %1</source>
-        <translation>無法打開檔案：
-%1</translation>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1943,109 +2425,167 @@ This may cause the affected plugins to malfunction.</source>
         <source>Attachments</source>
         <translation>附件</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>EntryView</name>
+    <name>EntryPreviewWidget</name>
     <message>
-        <source>Customize View</source>
-        <translation type="unfinished"/>
+        <source>Generate TOTP Token</source>
+        <translation>產生 TOTP Token</translation>
     </message>
     <message>
-        <source>Hide Usernames</source>
-        <translation>隱藏使用者名稱</translation>
+        <source>Close</source>
+        <translation>關閉</translation>
     </message>
     <message>
-        <source>Hide Passwords</source>
-        <translation>隱藏密碼</translation>
+        <source>General</source>
+        <translation>一般</translation>
     </message>
     <message>
-        <source>Fit to window</source>
-        <translation type="unfinished"/>
+        <source>Username</source>
+        <translation>使用者名稱</translation>
     </message>
     <message>
-        <source>Fit to contents</source>
-        <translation type="unfinished"/>
+        <source>Password</source>
+        <translation>密碼</translation>
     </message>
     <message>
-        <source>Reset to defaults</source>
-        <translation>重設為預設</translation>
+        <source>Expiration</source>
+        <translation>過期</translation>
     </message>
     <message>
-        <source>Attachments (icon)</source>
+        <source>URL</source>
+        <translation>網址</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>屬性</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>附件</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>附註</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>自動輸入</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>視窗</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>序列</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>搜尋中</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>搜尋</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>清除</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>從不</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[被保護]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+        <comment>attributes line</comment>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Group</name>
     <message>
-        <source>Recycle Bin</source>
-        <translation>回收桶</translation>
+        <source>Enabled</source>
+        <translation>啟用</translation>
     </message>
-</context>
-<context>
-    <name>HostInstaller</name>
     <message>
-        <source>KeePassXC: Cannot save file!</source>
-        <translation>KeePassXC: 無法保存檔案！</translation>
+        <source>Disabled</source>
+        <translation>停用</translation>
     </message>
     <message>
-        <source>Cannot save the native messaging script file.</source>
-        <translation>無法保存 native messaging 指令檔。</translation>
+        <source>Share</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>HttpPasswordGeneratorWidget</name>
-    <message>
-        <source>Length:</source>
-        <translation>長度：</translation>
-    </message>
+    <name>EntryView</name>
     <message>
-        <source>Character Types</source>
-        <translation>字元類型</translation>
+        <source>Customize View</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Upper Case Letters</source>
-        <translation>大寫英文字母</translation>
+        <source>Hide Usernames</source>
+        <translation>隱藏使用者名稱</translation>
     </message>
     <message>
-        <source>A-Z</source>
-        <translation>A-Z</translation>
+        <source>Hide Passwords</source>
+        <translation>隱藏密碼</translation>
     </message>
     <message>
-        <source>Lower Case Letters</source>
-        <translation>小寫英文字母</translation>
+        <source>Fit to window</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>a-z</source>
-        <translation>a-z</translation>
+        <source>Fit to contents</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Numbers</source>
-        <translation>數字</translation>
+        <source>Reset to defaults</source>
+        <translation>重設為預設</translation>
     </message>
     <message>
-        <source>0-9</source>
-        <translation>0-9</translation>
+        <source>Attachments (icon)</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Group</name>
     <message>
-        <source>Special Characters</source>
-        <translation>特殊字元</translation>
+        <source>Recycle Bin</source>
+        <translation>回收桶</translation>
     </message>
     <message>
-        <source>/*_&amp; ...</source>
-        <translation>/*_&amp; ...</translation>
+        <source>[empty]</source>
+        <comment>group has no children</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>GroupModel</name>
     <message>
-        <source>Exclude look-alike characters</source>
-        <translation>去除相似的字元</translation>
+        <source>%1</source>
+        <comment>Template for name without annotation</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>HostInstaller</name>
     <message>
-        <source>Ensure that the password contains characters from every group</source>
-        <translation>確保密碼包含每一組字元</translation>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation>KeePassXC: 無法保存檔案！</translation>
     </message>
     <message>
-        <source>Extended ASCII</source>
-        <translation>擴展 ASCII 碼</translation>
+        <source>Cannot save the native messaging script file.</source>
+        <translation>無法保存 native messaging 指令檔。</translation>
     </message>
 </context>
 <context>
@@ -2073,6 +2613,26 @@ This may cause the affected plugins to malfunction.</source>
         <source>Wrong key or database file is corrupt.</source>
         <translation>金鑰不正確或是資料庫損壞。</translation>
     </message>
+    <message>
+        <source>missing database headers</source>
+        <translation>缺少資料庫標頭</translation>
+    </message>
+    <message>
+        <source>Header doesn&apos;t match hash</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>無效的標頭 ID 大小</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>無效的標頭欄位長度</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>無效的資料長度</translation>
+    </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
@@ -2232,10 +2792,6 @@ This may cause the affected plugins to malfunction.</source>
 <context>
     <name>KdbxReader</name>
     <message>
-        <source>Invalid cipher uuid length</source>
-        <translation>無效的加密法 uuid 長度</translation>
-    </message>
-    <message>
         <source>Unsupported cipher</source>
         <translation>不支援的加密</translation>
     </message>
@@ -2289,6 +2845,18 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Unsupported KeePass 2 database version.</source>
         <translation>不支援的 KeePass 2 資料庫版本。</translation>
     </message>
+    <message>
+        <source>Invalid cipher uuid length: %1 (length=%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to parse UUID: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read database file.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
@@ -2361,10 +2929,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>具有不同 uuid 的歷史元素</translation>
     </message>
     <message>
-        <source>Unable to decrypt entry string</source>
-        <translation>無法解密項目字串</translation>
-    </message>
-    <message>
         <source>Duplicate custom attribute found</source>
         <translation>找到重複的自訂屬性</translation>
     </message>
@@ -2413,6 +2977,12 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation>無法解壓縮二進位資料</translation>
     </message>
+    <message>
+        <source>XML error:
+%1
+Line %2, column %3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>KeePass1OpenWidget</name>
@@ -2576,28 +3146,126 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>Invalid entry field type</source>
         <translation>無效的項目欄位類型</translation>
     </message>
+    <message>
+        <source>unable to seek to content position</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>Main</name>
+    <name>KeeShare</name>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>現有的單實例鎖定檔無效。正在啟動新實例。</translation>
+        <source>Disabled share</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>無法建立鎖定文件。已停用單一實例模式。</translation>
+        <source>Import from</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>其他 KeePassXC 程式正在運行中。</translation>
+        <source>Export to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>測試加密函數時發生重大錯誤。</translation>
+        <source>Synchronize with</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeyComponentWidget</name>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - 錯誤</translation>
+        <source>Key Component</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key Component Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>取消</translation>
+    </message>
+    <message>
+        <source>Key Component set, click to change or remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add %1</source>
+        <comment>Add a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change %1</source>
+        <comment>Change a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove %1</source>
+        <comment>Remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1 set, click to change or remove</source>
+        <comment>Change or remove a key component</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyFileEditWidget</name>
+    <message>
+        <source>Browse</source>
+        <translation>瀏覽</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>產生</translation>
+    </message>
+    <message>
+        <source>Key File</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Error loading the key file '%1'
+Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>金鑰檔案</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>所有檔案</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>建立金鑰檔案……</translation>
+    </message>
+    <message>
+        <source>Error creating key file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create key file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>選擇金鑰檔案</translation>
     </message>
 </context>
 <context>
@@ -2611,10 +3279,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>最近的資料庫 (&amp;R)</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>匯入</translation>
-    </message>
-    <message>
         <source>&amp;Help</source>
         <translation>幫助 (&amp;H)</translation>
     </message>
@@ -2623,14 +3287,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>項目 (&amp;N)</translation>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
-        <translation>複製屬性到剪貼簿 (&amp;R)</translation>
-    </message>
-    <message>
-        <source>Time-based one-time password</source>
-        <translation>限時單次密碼</translation>
-    </message>
-    <message>
         <source>&amp;Groups</source>
         <translation>群組 (&amp;G)</translation>
     </message>
@@ -2659,30 +3315,10 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>關閉資料庫 (&amp;C)</translation>
     </message>
     <message>
-        <source>&amp;New database</source>
-        <translation>新的資料庫 (&amp;N)</translation>
-    </message>
-    <message>
-        <source>Merge from KeePassX database</source>
-        <translation>從 KeePassX 資料庫合併</translation>
-    </message>
-    <message>
-        <source>&amp;Add new entry</source>
-        <translation>新增項目 (&amp;A)</translation>
-    </message>
-    <message>
-        <source>&amp;View/Edit entry</source>
-        <translation>檢視/編輯項目 (&amp;V)</translation>
-    </message>
-    <message>
         <source>&amp;Delete entry</source>
         <translation>刪除項目 (&amp;D)</translation>
     </message>
     <message>
-        <source>&amp;Add new group</source>
-        <translation>新增群組 (&amp;A)</translation>
-    </message>
-    <message>
         <source>&amp;Edit group</source>
         <translation>編輯群組 (&amp;E)</translation>
     </message>
@@ -2695,14 +3331,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>將資料庫儲存為…… (&amp;V)</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>變更主金鑰…… (&amp;M)</translation>
-    </message>
-    <message>
-        <source>&amp;Database settings</source>
-        <translation>資料庫設定 (&amp;D)</translation>
-    </message>
-    <message>
         <source>Database settings</source>
         <translation>資料庫設定</translation>
     </message>
@@ -2711,10 +3339,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>複製項目 (&amp;C)</translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation>尋找 (&amp;F)</translation>
-    </message>
-    <message>
         <source>Copy &amp;username</source>
         <translation>複製使用者名稱 (&amp;U)</translation>
     </message>
@@ -2723,10 +3347,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>將使用者名稱複製到剪貼簿</translation>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
-        <translation>複製密碼 (&amp;Y)</translation>
-    </message>
-    <message>
         <source>Copy password to clipboard</source>
         <translation>將密碼複製到剪貼簿</translation>
     </message>
@@ -2739,14 +3359,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>密碼產生器</translation>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
-        <translation>執行自動輸入 (&amp;P)</translation>
-    </message>
-    <message>
-        <source>&amp;Open URL</source>
-        <translation>開啟網址 (&amp;O)</translation>
-    </message>
-    <message>
         <source>&amp;Lock databases</source>
         <translation>鎖定資料庫 (&amp;L)</translation>
     </message>
@@ -2779,22 +3391,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>匯出到 CSV 檔案…… (&amp;E)</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>匯入 KeePass 1 資料庫……</translation>
-    </message>
-    <message>
-        <source>Import CSV file...</source>
-        <translation>匯入 CSV 檔……</translation>
-    </message>
-    <message>
-        <source>Re&amp;pair database...</source>
-        <translation>修復資料庫…… (&amp;P)</translation>
-    </message>
-    <message>
-        <source>Show TOTP</source>
-        <translation>顯示 TOTP</translation>
-    </message>
-    <message>
         <source>Set up TOTP...</source>
         <translation>安裝 TOTP</translation>
     </message>
@@ -2815,14 +3411,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>設定檔存取錯誤：%1</translation>
     </message>
     <message>
-        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
-        <translation>&lt;p&gt;您似乎正在使用 KeePassHTTP 瀏覽器整合功能&gt;此功能已經棄用，未來我們將進行移除。&lt;br&gt;並請改用 KeePassXC-Browser 瀏覽器擴充功能！有關遷移的說明，請造訪我們的 &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;遷移指南&lt;/a&gt; (警告 %1/3)&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>read-only</source>
-        <translation>唯讀</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
@@ -2835,257 +3423,407 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>退出 KeePassXC</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 資料庫</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>請觸摸你 YubiKey 上的按鈕！</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>所有檔案</translation>
+        <source>WARNING: You are using an unstable build of KeePassXC!
+There is a high risk of corruption, maintain a backup of your databases.
+This version is not meant for production use.</source>
+        <translation>警告: 你正在使用非穩定版本的 KeePassXC!
+具有高風險的破壞可能, 請備份你的資料庫.
+這個版本不是給一般使用者使用.</translation>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>開啟資料庫</translation>
+        <source>&amp;Donate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>儲存已修復的資料庫</translation>
+        <source>Report a &amp;bug</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>寫入資料庫失敗。</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>請觸摸你 YubiKey 上的按鈕！</translation>
+        <source>&amp;Import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>WARNING: You are using an unstable build of KeePassXC!
-There is a high risk of corruption, maintain a backup of your databases.
-This version is not meant for production use.</source>
-        <translation>警告: 你正在使用非穩定版本的 KeePassXC!
-具有高風險的破壞可能, 請備份你的資料庫.
-這個版本不是給一般使用者使用.</translation>
+        <source>Copy att&amp;ribute...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Merge from database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge from another KDBX database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>View or edit entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;New group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Change master &amp;key...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Database settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform &amp;Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open &amp;URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePass 1 database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a KeePass 1 database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>CSV file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import a CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show TOTP QR Code...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Share entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <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 type="unfinished"/>
+    </message>
+    <message>
+        <source>Check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Would you like KeePassXC to check for updates on startup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You can always check for updates manually from the application menu.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>OpenSSHKey</name>
+    <name>Merger</name>
     <message>
-        <source>Invalid key file, expecting an OpenSSH key</source>
-        <translation>無效的金鑰檔案，預期應是 OpenSSH 金鑰</translation>
+        <source>Creating missing %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>PEM boundary mismatch</source>
-        <translation>PEM 邊界數量不對稱</translation>
+        <source>Relocating %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Base64 decoding failed</source>
-        <translation>Base64 解碼失敗</translation>
+        <source>Overwriting %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key file way too small.</source>
-        <translation>金鑰檔太小。</translation>
+        <source>older entry merged from database &quot;%1&quot;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key file magic header id invalid</source>
-        <translation>金鑰檔魔術標頭 id 無效</translation>
+        <source>Adding backup for older target %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Found zero keys</source>
-        <translation>找到零個金鑰</translation>
+        <source>Adding backup for older source %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Failed to read public key.</source>
-        <translation>無法讀取公開金鑰。</translation>
+        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Corrupted key file, reading private key failed</source>
-        <translation>金鑰檔損壞，讀取私密金鑰失敗</translation>
+        <source>Reapplying older source entry on top of newer target %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>No private key payload to decrypt</source>
-        <translation>私密金鑰中沒有載體可解密</translation>
+        <source>Synchronizing from newer source %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Trying to run KDF without cipher</source>
-        <translation>嘗試運行無加密的 KDF</translation>
+        <source>Synchronizing from older source %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase is required to decrypt this key</source>
-        <translation>需要密碼短語以解密此金鑰</translation>
+        <source>Deleting child %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Key derivation failed, key file corrupted?</source>
-        <translation>金鑰衍生失敗，金鑰檔已損壞？</translation>
+        <source>Deleting orphan %1 [%2]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Decryption failed, wrong passphrase?</source>
-        <translation>解密失敗，密碼短語錯誤？</translation>
+        <source>Changed deleted objects</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unexpected EOF while reading public key</source>
-        <translation>讀取公開金鑰時出現意外的檔案結尾</translation>
+        <source>Adding missing icon %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizard</name>
     <message>
-        <source>Unexpected EOF while reading private key</source>
-        <translation>讀取私密金鑰時出現意外的檔案結尾</translation>
+        <source>Create a new KeePassXC database...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t write public key as it is empty</source>
-        <translation>無法寫入公開金鑰，因為它是空的</translation>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>根</translation>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPage</name>
     <message>
-        <source>Unexpected EOF when writing public key</source>
-        <translation>編寫公開金鑰時出現意外的檔案結尾</translation>
+        <source>WizardPage</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can&apos;t write private key as it is empty</source>
-        <translation>無法寫入私密金鑰，因為它是空的</translation>
+        <source>En&amp;cryption Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unexpected EOF when writing private key</source>
-        <translation>編寫私密金鑰時出現意外的檔案結尾</translation>
+        <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"/>
     </message>
     <message>
-        <source>Unsupported key type: %1</source>
+        <source>Advanced Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unknown cipher: %1</source>
+        <source>Simple Settings</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageEncryption</name>
     <message>
-        <source>Cipher IV is too short for MD5 kdf</source>
+        <source>Encryption Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unknown KDF: %1</source>
+        <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"/>
     </message>
+</context>
+<context>
+    <name>NewDatabaseWizardPageMasterKey</name>
     <message>
-        <source>Unknown key type: %1</source>
+        <source>Database Master Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A master key known only to you protects your database.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>NewDatabaseWizardPageMetaData</name>
     <message>
-        <source>Dialog</source>
-        <translation>對話方塊</translation>
+        <source>General Database Information</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
-        <translation>啟用後才能讓 ChromeIPass 或 PassIFox 存取你的資料庫</translation>
+        <source>Please fill in the display name and an optional description for your new database:</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Enable KeePassHTTP server</source>
-        <translation>啟用 KeePassHTTP 伺服器</translation>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation>無效的金鑰檔案，預期應是 OpenSSH 金鑰</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>一般</translation>
+        <source>PEM boundary mismatch</source>
+        <translation>PEM 邊界數量不對稱</translation>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation>要求認證時顯示通知 (&amp;O)</translation>
+        <source>Base64 decoding failed</source>
+        <translation>Base64 解碼失敗</translation>
     </message>
     <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>只回傳最佳的網址相符項目而非所有網址相符的項目。(&amp;R)</translation>
+        <source>Key file way too small.</source>
+        <translation>金鑰檔太小。</translation>
     </message>
     <message>
-        <source>&amp;Return only best matching entries</source>
-        <translation>只回傳最佳的相符項目 (&amp;R)</translation>
+        <source>Key file magic header id invalid</source>
+        <translation>金鑰檔魔術標頭 id 無效</translation>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>若資料庫已鎖定，則請求解鎖 (&amp;Q)</translation>
+        <source>Found zero keys</source>
+        <translation>找到零個金鑰</translation>
+    </message>
+    <message>
+        <source>Failed to read public key.</source>
+        <translation>無法讀取公開金鑰。</translation>
+    </message>
+    <message>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation>金鑰檔損壞，讀取私密金鑰失敗</translation>
     </message>
     <message>
-        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation>只顯示相同協定的項目。(http://, https://, ftp://, ...)</translation>
+        <source>No private key payload to decrypt</source>
+        <translation>私密金鑰中沒有載體可解密</translation>
     </message>
     <message>
-        <source>&amp;Match URL schemes</source>
-        <translation>符合網址協定 (&amp;M)</translation>
+        <source>Trying to run KDF without cipher</source>
+        <translation>嘗試運行無加密的 KDF</translation>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>依使用者名稱排序符合項目 (&amp;U)</translation>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation>需要密碼短語以解密此金鑰</translation>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>依名稱排序符合項目 (&amp;M)</translation>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation>金鑰衍生失敗，金鑰檔已損壞？</translation>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>從目前的資料庫移除所有共用的加密金鑰 (&amp;E)</translation>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation>解密失敗，密碼短語錯誤？</translation>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>從目前的資料庫項目中移除所有權限。</translation>
+        <source>Unexpected EOF while reading public key</source>
+        <translation>讀取公開金鑰時出現意外的檔案結尾</translation>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>密碼產生器</translation>
+        <source>Unexpected EOF while reading private key</source>
+        <translation>讀取私密金鑰時出現意外的檔案結尾</translation>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>進階</translation>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation>無法寫入公開金鑰，因為它是空的</translation>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>總是允許存取項目 (&amp;A)</translation>
+        <source>Unexpected EOF when writing public key</source>
+        <translation>編寫公開金鑰時出現意外的檔案結尾</translation>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>總是允許更新項目 (&amp;U)</translation>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation>無法寫入私密金鑰，因為它是空的</translation>
     </message>
     <message>
-        <source>Only the selected database has to be connected with a client.</source>
-        <translation>只有所選的資料庫能連接到客戶端。</translation>
+        <source>Unexpected EOF when writing private key</source>
+        <translation>編寫私密金鑰時出現意外的檔案結尾</translation>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>在所有開啟的資料庫內搜尋相符的項目 (&amp;H)</translation>
+        <source>Unsupported key type: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>不支援自動建立或更新文字欄位。</translation>
+        <source>Unknown cipher: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>回傳 「KPH: 」 起首的進階文字欄位 (&amp;R)</translation>
+        <source>Cipher IV is too short for MD5 kdf</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown KDF: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown key type: %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PasswordEditWidget</name>
     <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP 埠：</translation>
+        <source>Enter password:</source>
+        <translation>輸入密碼：</translation>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>預設埠：19455</translation>
+        <source>Confirm password:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC 會在 127.0.0.1 上監聽此埠</translation>
+        <source>Password</source>
+        <translation>密碼</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation>&lt;b&gt;警告：&lt;/b&gt;下列選項可能極具風險！</translation>
+        <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"/>
     </message>
     <message>
-        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>KeePassHTTP 已經棄用，未來我們將進行移除。&lt;br&gt;並請改用 KeePassXC-Browser 瀏覽器擴充功能！有關遷移的說明，請造訪我們的 &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;遷移指南&lt;/a&gt;。&lt;/p&gt;</translation>
+        <source>Password cannot be empty.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>無法綁定到特殊權限埠</translation>
+        <source>Passwords do not match.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>無法綁定到 1024 以下的特殊權限埠！
-將使用預設埠 19455。</translation>
+        <source>Generate master password</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3156,18 +3894,10 @@ Using default port 19455.</source>
         <translation>詞彙表：</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>詞彙數：</translation>
-    </message>
-    <message>
         <source>Word Separator:</source>
         <translation>單詞分隔符號：</translation>
     </message>
     <message>
-        <source>Generate</source>
-        <translation>產生</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>複製</translation>
     </message>
@@ -3180,10 +3910,6 @@ Using default port 19455.</source>
         <translation>關閉</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation>套用</translation>
-    </message>
-    <message>
         <source>Entropy: %1 bit</source>
         <translation>Entropy: %1 bit</translation>
     </message>
@@ -3211,6 +3937,171 @@ Using default port 19455.</source>
         <comment>Password quality</comment>
         <translation>極好</translation>
     </message>
+    <message>
+        <source>ExtendedASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to advanced mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>進階</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters A to F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Braces</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>{[(</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Punctuation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>.,:;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quotes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&quot; &apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Math</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;*+!?=</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Dashes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>\_|-/</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Logograms</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>#$%&amp;&amp;@^`~</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Switch to simple mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Simple</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Character set to exclude from generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add non-hex letters to &quot;do not include&quot; list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Word Co&amp;unt:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Regenerate</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QApplication</name>
+    <message>
+        <source>KeeShare</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QFileDialog</name>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>刪除</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>移除</translation>
+    </message>
+    <message>
+        <source>Skip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>關閉</translation>
+    </message>
+    <message>
+        <source>Merge</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3231,34 +4122,18 @@ Using default port 19455.</source>
         <translation>無法解密訊息</translation>
     </message>
     <message>
-        <source>Timeout or cannot connect to KeePassXC</source>
-        <translation>逾時或無法連接到 KeePassXC</translation>
-    </message>
-    <message>
         <source>Action cancelled or denied</source>
         <translation>操作被取消或被拒絕</translation>
     </message>
     <message>
-        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation>無法加密訊息或未找到公開金鑰。是否在 KeePassXC 中啟用了 native messaging 功能？</translation>
-    </message>
-    <message>
         <source>KeePassXC association failed, try again</source>
         <translation>KeePassXC 關聯失敗，請重試</translation>
     </message>
     <message>
-        <source>Key change was not successful</source>
-        <translation>金鑰更改不成功</translation>
-    </message>
-    <message>
         <source>Encryption key is not recognized</source>
         <translation>加密金鑰未被識別</translation>
     </message>
     <message>
-        <source>No saved databases found</source>
-        <translation>找不到已保存的資料庫</translation>
-    </message>
-    <message>
         <source>Incorrect action</source>
         <translation>錯誤的操作</translation>
     </message>
@@ -3384,10 +4259,6 @@ Using default port 19455.</source>
         <translation>插入密碼以解除鎖定 %1： </translation>
     </message>
     <message>
-        <source>Failed to load key file %1 : %2</source>
-        <translation>未能載入金鑰檔 %1：%2</translation>
-    </message>
-    <message>
         <source>WARNING: You are using a legacy key file format which may become
 unsupported in the future.
 
@@ -3471,12 +4342,6 @@ Available commands:
         <translation>從裝置讀取時出錯</translation>
     </message>
     <message>
-        <source>file empty !
-</source>
-        <translation>檔案是空的！
-</translation>
-    </message>
-    <message>
         <source>malformed string</source>
         <translation>格式不正確的字串</translation>
     </message>
@@ -3485,30 +4350,6 @@ Available commands:
         <translation>缺少右引號</translation>
     </message>
     <message>
-        <source>AES: 256-bit</source>
-        <translation>AES: 256 位元</translation>
-    </message>
-    <message>
-        <source>Twofish: 256-bit</source>
-        <translation>Twofish: 256 位元</translation>
-    </message>
-    <message>
-        <source>ChaCha20: 256-bit</source>
-        <translation>ChaCha20: 256 位元</translation>
-    </message>
-    <message>
-        <source>Argon2 (KDBX 4 – recommended)</source>
-        <translation>Argon2 (KDBX 4 – 推薦)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 4)</source>
-        <translation>AES-KDF (KDBX 4)</translation>
-    </message>
-    <message>
-        <source>AES-KDF (KDBX 3.1)</source>
-        <translation>AES-KDF (KDBX 3.1)</translation>
-    </message>
-    <message>
         <source>Group</source>
         <translation>群組</translation>
     </message>
@@ -3537,10 +4378,6 @@ Available commands:
         <translation>已建立</translation>
     </message>
     <message>
-        <source>Legacy Browser Integration</source>
-        <translation>舊式瀏覽器整合</translation>
-    </message>
-    <message>
         <source>Browser Integration</source>
         <translation>瀏覽器整合</translation>
     </message>
@@ -3569,40 +4406,446 @@ Available commands:
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Wordlist for the diceware generator.
+[Default: EFF English]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a new random password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid value for password length %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not create entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter password for new entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully added entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy the current TOTP to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid timeout value %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry %1 not found.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry with path %1 has no TOTP set up.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s current TOTP copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry&apos;s password copied to the clipboard!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Clearing the clipboard in %1 second(s)...</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Clipboard cleared!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Silence password prompt and other secondary outputs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>count</source>
+        <comment>CLI parameter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist for the diceware generator.
-[Default: EFF English]</source>
+        <source>Invalid value for password length: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Generate a new random password.</source>
+        <source>Could not find entry with path %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not changing any field for entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enter new password for entry: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully edited entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Log10 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Length of the generated password.</source>
+        <source>Multi-word extra bits %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use lowercase characters in the generated password.</source>
+        <source>Type: Bruteforce</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use uppercase characters in the generated password.</source>
+        <source>Type: Dictionary</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use numbers in the generated password.</source>
+        <source>Type: Dict+Leet</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use special characters in the generated password.</source>
+        <source>Type: User Words</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use extended ASCII in the generated password.</source>
+        <source>Type: User+Leet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Bruteforce(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dictionary(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Dict+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User Words(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: User+Leet(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Repeated(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Sequence(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Spatial(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Date(Rep)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Type: Unknown%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entropy %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 does not exist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open file %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while reading the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error while parsing the database:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length of the generated password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use numbers.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use special characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude character set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>chars</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude similar looking characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Include characters from every selected group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Recursively list the elements of the group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot find group %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading merge file:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file : %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save database to file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully recycled entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully deleted entry %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show the entry&apos;s current TOTP.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ERROR: unknown attribute %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No program defined for clipboard manipulation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to start program %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>%1: (row, col) %2,%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256 位元</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256 位元</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256 位元</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – 推薦)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
+    </message>
+    <message>
+        <source>Invalid Settings</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid Key</source>
+        <comment>TOTP</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Message encryption failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No groups found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create a new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File %1 already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading the key file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No key is set. Aborting database creation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to save the database: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Successfully created new database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to encrypt database (Press enter to leave blank): </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Creating KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Loading KeyFile %1 failed: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>從資料庫中移除項目。</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>欲移除的項目路徑。</translation>
+    </message>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>現有的單實例鎖定檔無效。正在啟動新實例。</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>無法建立鎖定文件。已停用單一實例模式。</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - 跨平台的密碼管理工具</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>欲開啟的密碼資料庫檔名 (*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>自訂設定檔路徑</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>資料庫的金鑰檔案</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>從 stdin 讀取資料庫密碼</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation>父層視窗控制</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>其他 KeePassXC 程式正在運行中。</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>測試加密函數時發生重大錯誤。</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - 錯誤</translation>
+    </message>
+    <message>
+        <source>Database password: </source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -3641,11 +4884,97 @@ Available commands:
     </message>
 </context>
 <context>
-    <name>SearchWidget</name>
+    <name>SSHAgent</name>
+    <message>
+        <source>Agent connection failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent protocol error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot add identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No agent running, cannot remove identity.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Agent refused this identity. Possible reasons include:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The key has already been added.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Restricted lifetime is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A confirmation request is not supported by the agent (check options).</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchHelpWidget</name>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Every search term must match (ie, logical AND)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Modifiers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>exclude term from results</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match term exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>use regex in term</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fields</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Term Wildcards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match anything</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>match one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>logical OR</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <source>Search...</source>
-        <translation>搜尋……</translation>
+        <source>Examples</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>SearchWidget</name>
     <message>
         <source>Search</source>
         <translation>搜尋</translation>
@@ -3655,314 +4984,316 @@ Available commands:
         <translation>清除</translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation>區分大小寫</translation>
-    </message>
-    <message>
         <source>Limit search to selected group</source>
         <translation>限制只搜尋選定的群組</translation>
     </message>
+    <message>
+        <source>Search Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search (%1)...</source>
+        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation>區分大小寫</translation>
+    </message>
 </context>
 <context>
-    <name>Service</name>
+    <name>SettingsWidgetKeeShare</name>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC：新的金鑰關聯請求</translation>
+        <source>Active</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation>你已接收到上述金鑰的關聯請求。
-如果你允許透過此金鑰存取你的 KeePassXC 資料庫
-請取一個唯一識別名並按下接受。</translation>
+        <source>Allow export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC：覆蓋現有的金鑰？</translation>
+        <source>Allow import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>已存在名為「%1」的共用加密金鑰。
-進行覆蓋？</translation>
+        <source>Own certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC：更新項目</translation>
+        <source>Fingerprint:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>更新 %1 到 %2 的資訊？</translation>
+        <source>Certificate:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC：資料庫已鎖定！</translation>
+        <source>Signer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>目前的資料庫已鎖定！
-請解鎖所選的資料庫或選擇其他已解鎖的資料庫。</translation>
+        <source>Key:</source>
+        <translation>金鑰：</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC：從資料庫中移除金鑰</translation>
-    </message>
-    <message numerus="yes">
-        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation><numerusform>成功從 KeePassX/Http Settings 移除 %n 加密金鑰。</numerusform></translation>
+        <source>Generate</source>
+        <translation>產生</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC：找不到金鑰</translation>
+        <source>Import</source>
+        <translation>匯入</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>KeePassHttp Settings 中找不到共享加密金鑰。</translation>
+        <source>Export</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC：設定不可用！</translation>
+        <source>Imported certificates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>目前的資料庫沒有 KeePassHttp Settings 項目。</translation>
+        <source>Trust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>正在移除所有已儲存的權限……</translation>
+        <source>Ask</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>中止</translation>
+        <source>Untrust</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC：已移除權限</translation>
+        <source>Remove</source>
+        <translation>移除</translation>
     </message>
-    <message numerus="yes">
-        <source>Successfully removed permissions from %n entries.</source>
-        <translation><numerusform>成功從 %n 個項目中移除權限。</numerusform></translation>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC：找不到帶有權限的項目！</translation>
+        <source>Status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>目前的資料庫中沒有帶有權限的項目。</translation>
+        <source>Fingerprint</source>
+        <translation>指紋</translation>
     </message>
-</context>
-<context>
-    <name>SettingsWidget</name>
     <message>
-        <source>Application Settings</source>
-        <translation>應用程式設定</translation>
+        <source>Certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>一般</translation>
+        <source>Trusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Security</source>
-        <translation>安全性</translation>
+        <source>Untrusted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
-        <translation>設定檔存取錯誤：%1</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetGeneral</name>
     <message>
-        <source>Basic Settings</source>
-        <translation>基本設定</translation>
+        <source>key.share</source>
+        <comment>Filetype for KeeShare key</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>只能啟動單一 KeePassXC 程式</translation>
+        <source>KeeShare key file</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember last databases</source>
-        <translation>記住最近的資料庫</translation>
+        <source>All files</source>
+        <translation>所有檔案</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>記住最近的金鑰檔案與安全加密狗</translation>
+        <source>Select path</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>啟動時載入之前的資料庫</translation>
+        <source>Exporting changed certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically save on exit</source>
-        <translation>離開時，自動儲存</translation>
+        <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"/>
     </message>
     <message>
-        <source>Automatically save after every change</source>
-        <translation>修改後，自動儲存</translation>
+        <source>%1.%2</source>
+        <comment>Template for KeeShare key file</comment>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ShareObserver</name>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>當有外部修改時自動重新載入資料庫</translation>
+        <source>Import from container without signature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>在複製到剪貼簿時最小化</translation>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>程式啟動時視窗最小化</translation>
+        <source>Import from container with certificate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>新增項目時使用群組圖示</translation>
+        <source>Do you want to trust %1 with the fingerprint of %2 from %3</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>未變更資料時（例如：擴展群組時）不要將資料庫標記為已修改</translation>
+        <source>Not this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide the Details view</source>
-        <translation>隱藏詳細資訊檢視</translation>
+        <source>Never</source>
+        <translation>從不</translation>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>顯示工作列圖示</translation>
+        <source>Always</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>將視窗最小化至工作列</translation>
+        <source>Just this time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
-        <translation>將視窗最小化至工作列而非關閉程式</translation>
+        <source>Import from %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Dark system tray icon</source>
-        <translation>深色系統列圖示</translation>
+        <source>Import from %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>語言</translation>
+        <source>Imported from %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>自動輸入</translation>
+        <source>Signed share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>使用項目標題來匹配全域自動輸入的視窗</translation>
+        <source>File is not readable</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>使用項目 URL 來匹配全域自動輸入的視窗</translation>
+        <source>Invalid sharing container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation>在執行自動輸入前始終詢問</translation>
+        <source>Untrusted import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>全域自動輸入快捷鍵</translation>
+        <source>Successful signed import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation>自動輸入延遲</translation>
+        <source>Unexpected error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
-        <comment>Milliseconds</comment>
-        <translation> 毫秒</translation>
+        <source>Unsigned share container are not supported - import prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Startup</source>
-        <translation>啟動</translation>
+        <source>Successful unsigned import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File Management</source>
-        <translation>檔案管理</translation>
+        <source>File does not exist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
+        <source>Unknown share container type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Backup database file before saving</source>
+        <source>Overwriting signed share container is not supported - export prevented</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entry Management</source>
-        <translation>項目管理</translation>
+        <source>Could not write export container (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>一般</translation>
+        <source>Could not embed signature (%1)</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>SettingsWidgetSecurity</name>
     <message>
-        <source>Timeouts</source>
-        <translation>超時</translation>
+        <source>Could not embed database (%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear clipboard after</source>
-        <translation>多久後清除剪貼簿</translation>
+        <source>Overwriting unsigned share container is not supported - export prevented</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> 秒</translation>
+        <source>Could not write export container</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after inactivity of</source>
-        <translation>多久沒有動作之後鎖定資料庫</translation>
+        <source>Unexpected export error occurred</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>便利</translation>
+        <source>Export to %1 failed (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>當工作階段鎖定或蓋上螢幕時鎖定資料庫</translation>
+        <source>Export to %1 successful (%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases after minimizing the window</source>
-        <translation>最小化視窗後鎖定資料庫</translation>
+        <source>Export to %1</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>TotpDialog</name>
     <message>
-        <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>顯示密碼時不需要重複輸入密碼</translation>
+        <source>Timed Password</source>
+        <translation>定時型密碼</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>預設以明碼顯示密碼</translation>
+        <source>000000</source>
+        <translation>000000</translation>
     </message>
     <message>
-        <source>Hide passwords in the preview panel</source>
-        <translation>在預覽面板中隱藏密碼</translation>
+        <source>Copy</source>
+        <translation>複製</translation>
     </message>
+    <message numerus="yes">
+        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>TotpExportSettingsDialog</name>
     <message>
-        <source>Hide entry notes by default</source>
-        <translation>預設隱藏項目備註</translation>
+        <source>Copy</source>
+        <translation>複製</translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>隱私</translation>
+        <source>NOTE: These TOTP settings are custom and may not work with other authenticators.</source>
+        <comment>TOTP QR code dialog warning</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use Google as fallback for downloading website icons</source>
-        <translation>使用 Google 搜尋作為下載網站圖示的備案</translation>
+        <source>There was an error creating the QR code.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re-lock previously locked database after performing Auto-Type</source>
+        <source>Closing in %1 seconds.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>SetupTotpDialog</name>
+    <name>TotpSetupDialog</name>
     <message>
         <source>Setup TOTP</source>
         <translation>安裝 TOTP</translation>
@@ -3984,59 +5315,84 @@ Please unlock the selected database or choose another one which is unlocked.</so
         <translation>使用自訂設定</translation>
     </message>
     <message>
-        <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation>注意：了解這些選項之前切勿進行變更。</translation>
+        <source>Custom Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Time step:</source>
         <translation>時間間隔：</translation>
     </message>
     <message>
-        <source>8 digits</source>
-        <translation>8 位數</translation>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> 秒</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>代碼長度：</translation>
     </message>
     <message>
         <source>6 digits</source>
         <translation>6 位數</translation>
     </message>
     <message>
-        <source>Code size:</source>
-        <translation>代碼長度：</translation>
+        <source>7 digits</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> sec</source>
-        <comment>Seconds</comment>
-        <translation> 秒</translation>
+        <source>8 digits</source>
+        <translation>8 位數</translation>
     </message>
 </context>
 <context>
-    <name>TotpDialog</name>
+    <name>UpdateCheckDialog</name>
     <message>
-        <source>Timed Password</source>
-        <translation>定時型密碼</translation>
+        <source>Checking for updates</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>000000</source>
-        <translation>000000</translation>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>複製</translation>
+        <source>Close</source>
+        <translation>關閉</translation>
     </message>
     <message>
-        <source>Expires in</source>
-        <translation>還剩下</translation>
+        <source>Update Error!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>seconds</source>
-        <translation>秒</translation>
+        <source>An error occurred in retrieving update information.</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>UnlockDatabaseWidget</name>
     <message>
-        <source>Unlock database</source>
-        <translation>解鎖資料庫</translation>
+        <source>Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Software Update</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>A new version of KeePassXC is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is now available — you have %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Download it at keepassxc.org</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You&apos;re up-to-date!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC %1 is currently the newest version available</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -4071,42 +5427,26 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
 </context>
 <context>
-    <name>main</name>
-    <message>
-        <source>Remove an entry from the database.</source>
-        <translation>從資料庫中移除項目。</translation>
-    </message>
-    <message>
-        <source>Path of the database.</source>
-        <translation>資料庫的路徑。</translation>
-    </message>
-    <message>
-        <source>Path of the entry to remove.</source>
-        <translation>欲移除的項目路徑。</translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - 跨平台的密碼管理工具</translation>
-    </message>
+    <name>YubiKeyEditWidget</name>
     <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>欲開啟的密碼資料庫檔名 (*.kdbx)</translation>
+        <source>Refresh</source>
+        <translation>重新整理</translation>
     </message>
     <message>
-        <source>path to a custom config file</source>
-        <translation>自訂設定檔路徑</translation>
+        <source>YubiKey Challenge-Response</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>key file of the database</source>
-        <translation>資料庫的金鑰檔案</translation>
+        <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"/>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>從 stdin 讀取資料庫密碼</translation>
+        <source>No YubiKey detected, please ensure it&apos;s plugged in.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Parent window handle</source>
-        <translation>父層視窗控制</translation>
+        <source>No YubiKey inserted.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/src/cli/Remove.cpp b/src/cli/Remove.cpp
index a1cda2e2d..4663d83ec 100644
--- a/src/cli/Remove.cpp
+++ b/src/cli/Remove.cpp
@@ -47,11 +47,11 @@ int Remove::execute(const QStringList& arguments)
     TextStream errorTextStream(Utils::STDERR, QIODevice::WriteOnly);
 
     QCommandLineParser parser;
-    parser.setApplicationDescription(QCoreApplication::tr("main", "Remove an entry from the database."));
-    parser.addPositionalArgument("database", QCoreApplication::tr("main", "Path of the database."));
+    parser.setApplicationDescription(QObject::tr("Remove an entry from the database."));
+    parser.addPositionalArgument("database", QObject::tr("Path of the database."));
     parser.addOption(Command::QuietOption);
     parser.addOption(Command::KeyFileOption);
-    parser.addPositionalArgument("entry", QCoreApplication::tr("main", "Path of the entry to remove."));
+    parser.addPositionalArgument("entry", QObject::tr("Path of the entry to remove."));
     parser.addHelpOption();
     parser.process(arguments);
 
diff --git a/src/gui/Application.cpp b/src/gui/Application.cpp
index 03cd0e551..5ad928fd3 100644
--- a/src/gui/Application.cpp
+++ b/src/gui/Application.cpp
@@ -111,8 +111,7 @@ Application::Application(int& argc, char** argv)
 
             if (!m_alreadyRunning) {
                 // If we get here then the original instance is likely dead
-                qWarning() << QCoreApplication::translate(
-                                  "Main", "Existing single-instance lock file is invalid. Launching new instance.")
+                qWarning() << QObject::tr("Existing single-instance lock file is invalid. Launching new instance.")
                                   .toUtf8()
                                   .constData();
 
@@ -126,8 +125,7 @@ Application::Application(int& argc, char** argv)
         break;
     }
     default:
-        qWarning() << QCoreApplication::translate("Main",
-                                                  "The lock file could not be created. Single-instance mode disabled.")
+        qWarning() << QObject::tr("The lock file could not be created. Single-instance mode disabled.")
                           .toUtf8()
                           .constData();
     }
diff --git a/src/gui/dbsettings/DatabaseSettingsWidgetEncryption.cpp b/src/gui/dbsettings/DatabaseSettingsWidgetEncryption.cpp
index f6ed2f577..b536dfc71 100644
--- a/src/gui/dbsettings/DatabaseSettingsWidgetEncryption.cpp
+++ b/src/gui/dbsettings/DatabaseSettingsWidgetEncryption.cpp
@@ -127,7 +127,7 @@ void DatabaseSettingsWidgetEncryption::setupAlgorithmComboBox()
 {
     m_ui->algorithmComboBox->clear();
     for (auto& cipher : asConst(KeePass2::CIPHERS)) {
-        m_ui->algorithmComboBox->addItem(QCoreApplication::translate("KeePass2", cipher.second.toUtf8()),
+        m_ui->algorithmComboBox->addItem(cipher.second.toUtf8(),
                                          cipher.first.toByteArray());
     }
     int cipherIndex = m_ui->algorithmComboBox->findData(m_db->cipher().toByteArray());
@@ -142,7 +142,7 @@ void DatabaseSettingsWidgetEncryption::setupKdfComboBox()
     bool block = m_ui->kdfComboBox->blockSignals(true);
     m_ui->kdfComboBox->clear();
     for (auto& kdf : asConst(KeePass2::KDFS)) {
-        m_ui->kdfComboBox->addItem(QCoreApplication::translate("KeePass2", kdf.second.toUtf8()),
+        m_ui->kdfComboBox->addItem(kdf.second.toUtf8(),
                                    kdf.first.toByteArray());
     }
     m_ui->kdfComboBox->blockSignals(block);
diff --git a/src/gui/entry/EntryAttachmentsWidget.cpp b/src/gui/entry/EntryAttachmentsWidget.cpp
index e34139cc5..810b4bde5 100644
--- a/src/gui/entry/EntryAttachmentsWidget.cpp
+++ b/src/gui/entry/EntryAttachmentsWidget.cpp
@@ -312,7 +312,7 @@ bool EntryAttachmentsWidget::insertAttachments(const QStringList& filenames, QSt
     }
 
     if (!errors.isEmpty()) {
-        errorMessage = tr("Unable to open files:\n%1").arg(errors.join('\n'));
+        errorMessage = tr("Unable to open file(s):\n%1", "", errors.size()).arg(errors.join('\n'));
     }
 
     return errors.isEmpty();
diff --git a/src/main.cpp b/src/main.cpp
index 22616ae50..a88deb3b3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -68,22 +68,22 @@ int main(int argc, char** argv)
 
     QCommandLineParser parser;
     parser.setApplicationDescription(
-        QCoreApplication::translate("main", "KeePassXC - cross-platform password manager"));
+        QObject::tr("KeePassXC - cross-platform password manager"));
     parser.addPositionalArgument(
         "filename",
-        QCoreApplication::translate("main", "filenames of the password databases to open (*.kdbx)"),
+        QObject::tr("filenames of the password databases to open (*.kdbx)"),
         "[filename(s)]");
 
     QCommandLineOption configOption(
-        "config", QCoreApplication::translate("main", "path to a custom config file"), "config");
+        "config", QObject::tr("path to a custom config file"), "config");
     QCommandLineOption keyfileOption(
-        "keyfile", QCoreApplication::translate("main", "key file of the database"), "keyfile");
+        "keyfile", QObject::tr("key file of the database"), "keyfile");
     QCommandLineOption pwstdinOption("pw-stdin",
-                                     QCoreApplication::translate("main", "read password of the database from stdin"));
+                                     QObject::tr("read password of the database from stdin"));
     // This is needed under Windows where clients send --parent-window parameter with Native Messaging connect method
     QCommandLineOption parentWindowOption(QStringList() << "pw"
                                                         << "parent-window",
-                                          QCoreApplication::translate("main", "Parent window handle"),
+                                          QObject::tr("Parent window handle"),
                                           "handle");
 
     QCommandLineOption helpOption = parser.addHelpOption();
@@ -106,7 +106,7 @@ int main(int argc, char** argv)
         if (!fileNames.isEmpty()) {
             app.sendFileNamesToRunningInstance(fileNames);
         }
-        qWarning() << QCoreApplication::translate("Main", "Another instance of KeePassXC is already running.")
+        qWarning() << QObject::tr("Another instance of KeePassXC is already running.")
                           .toUtf8()
                           .constData();
         return 0;
@@ -115,10 +115,10 @@ int main(int argc, char** argv)
     QApplication::setQuitOnLastWindowClosed(false);
 
     if (!Crypto::init()) {
-        QString error = QCoreApplication::translate("Main", "Fatal error while testing the cryptographic functions.");
+        QString error = QObject::tr("Fatal error while testing the cryptographic functions.");
         error.append("\n");
         error.append(Crypto::errorString());
-        MessageBox::critical(nullptr, QCoreApplication::translate("Main", "KeePassXC - Error"), error);
+        MessageBox::critical(nullptr, QObject::tr("KeePassXC - Error"), error);
         return 1;
     }
 
@@ -142,7 +142,7 @@ int main(int argc, char** argv)
             // buffer for native messaging, even if the specified file does not exist
             static QTextStream in(stdin, QIODevice::ReadOnly);
             static QTextStream out(stdout, QIODevice::WriteOnly);
-            out << QCoreApplication::translate("Main", "Database password: ") << flush;
+            out << QObject::tr("Database password: ") << flush;
             password = Utils::getPassword();
         }